X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_association_manager.go;h=1b105b0f99a3f0bdc155a83fe2c6486db873a141;hb=b23d04b0a9b31a525ecb3a55dacb6c22008339e1;hp=e313c191efdabcd668fbe04fda189ff9e83f3bcf;hpb=39dd2619102ed1819f57bd43fddca0947f68f5bf;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_association_manager.go b/E2Manager/managers/e2t_association_manager.go
index e313c19..1b105b0 100644
--- a/E2Manager/managers/e2t_association_manager.go
+++ b/E2Manager/managers/e2t_association_manager.go
@@ -54,13 +54,14 @@ func (m *E2TAssociationManager) AssociateRan(e2tAddress string, nodebInfo *entit
 
 	nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
 	nodebInfo.ConnectionAttempts = 0
+
 	rnibErr := m.rnibDataService.UpdateNodebInfo(nodebInfo)
 	if rnibErr != nil {
 		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed to update RAN.AssociatedE2TInstanceAddress in rNib. Error: %s", ranName, rnibErr)
 		return rnibErr
 	}
 
-	err = m.e2tInstanceManager.AddRanToInstance(ranName, e2tAddress)
+	err = m.e2tInstanceManager.AddRansToInstance(e2tAddress, []string{ranName})
 	if err != nil {
 		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed to add RAN to E2T instance %s. Error: %s", ranName, e2tAddress, err)
 		return err
@@ -99,3 +100,40 @@ func (m *E2TAssociationManager) DissociateRan(e2tAddress string, ranName string)
 	}
 	return nil
 }
+
+func (m *E2TAssociationManager) RemoveE2tInstance(e2tInstance *entities.E2TInstance, ransToBeDissociated []string, ranAssociationList map[string][]string) error {
+	m.logger.Infof("#E2TAssociationManager.RemoveE2tInstance -  Removing E2T %s and re-associating its associated RANs.", e2tInstance.Address)
+
+	err := m.rmClient.DeleteE2TInstance(e2tInstance.Address, ransToBeDissociated, ranAssociationList)
+	if err != nil {
+		_ = m.setStateToRoutingManagerFailure(e2tInstance)
+		m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - RoutingManager failure: Failed to delete E2T %s. Error: %s", e2tInstance.Address, err)
+		return err
+	}
+
+	err = m.e2tInstanceManager.RemoveE2TInstance(e2tInstance.Address)
+	if err != nil {
+		m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - Failed to remove E2T %s. Error: %s", e2tInstance.Address, err)
+		return err
+	}
+
+	for e2tAddress, associatedRans := range ranAssociationList {
+		err = m.e2tInstanceManager.AddRansToInstance(e2tAddress, associatedRans)
+		if err != nil {
+			m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - Failed to add RANs %s to E2T %s. Error: %s", associatedRans, e2tAddress, err)
+			return err
+		}
+	}
+
+	m.logger.Infof("#E2TAssociationManager.RemoveE2tInstance -  E2T %s successfully removed.", e2tInstance.Address)
+	return nil
+}
+
+func (m *E2TAssociationManager) setStateToRoutingManagerFailure(e2tInstance *entities.E2TInstance) error {
+
+	err := m.e2tInstanceManager.SetE2tInstanceState(e2tInstance.Address, e2tInstance.State, entities.RoutingManagerFailure)
+	if err != nil {
+		return err
+	}
+	return nil
+}