Add external contracts support (import and export) for ACI

Author: Satish Ramachandran

netmaster/objApi/apiController.go

@@ -366,107 +366,6 @@ func endpointGroupCleanup(endpointGroup *contivModel.EndpointGroup) {
 // FIXME: hack to allocate unique endpoint group ids
 var globalEpgID = 1
 
-/*
-// Some utility functions to work with the external contracts
-func extContractsGrpDeregister(epg *contivModel.EndpointGroup, contractsGrp *contivModel.ExtContractsGroup, contractType string) error {
-	if contractsGrp == nil {
-		errStr := fmt.Sprintf("%s External contracts group not found", contractType)
-		log.Errorf(errStr)
-		return core.Errorf(errStr)
-	}
-
-	modeldb.RemoveLinkSet(&contractsGrp.LinkSets.EndpointGroups, epg)
-	if contractType == "provided" {
-		modeldb.RemoveLinkSet(&epg.LinkSets.ProvExtContractsGrps, contractsGrp)
-	} else if contractType == "consumed" {
-		modeldb.RemoveLinkSet(&epg.LinkSets.ConsExtContractsGrps, contractsGrp)
-	}
-	// Links broken, update the contracts group object.
-	err := contractsGrp.Write()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func extContractsGrpValidateAndRegister(epg *contivModel.EndpointGroup, contractsGrp *contivModel.ExtContractsGroup, contractType string) error {
-	if contractsGrp == nil {
-		errStr := fmt.Sprintf("%s External contracts group not found", contractType)
-		log.Errorf(errStr)
-		return core.Errorf(errStr)
-	}
-
-	if strings.ToLower(contractsGrp.ContractsType) != contractType {
-		errStr := fmt.Sprintf("Incorrect type for contract group: %v", contractsGrp)
-		log.Errorf(errStr)
-		return core.Errorf(errStr)
-	}
-
-	// Establish the necessary links.
-	// TBD: Error handling. In the loop, we are bailing out
-	// on failure. How do we take care of already established
-	// links?
-	modeldb.AddLinkSet(&contractsGrp.LinkSets.EndpointGroups, epg)
-	if contractType == "provided" {
-		modeldb.AddLinkSet(&epg.LinkSets.ProvExtContractsGrps, contractsGrp)
-	} else if contractType == "consumed" {
-		modeldb.AddLinkSet(&epg.LinkSets.ConsExtContractsGrps, contractsGrp)
-	}
-
-	// Links made, write the policy set object.
-	err := contractsGrp.Write()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func cleanupExternalContracts(endpointGroup *contivModel.EndpointGroup) error {
-	// Cleanup consumed external contracts
-	for _, consExtContractsGrp := range endpointGroup.ConsExtContractsGrps {
-		contractsGrp := contivModel.FindExtContractsGroup(consExtContractsGrp)
-		err = extContractsGrpDeregister(endpointGroup, contractsGrp, "consumed")
-		if err != nil {
-			return err
-		}
-	}
-
-	// Cleanup provided external contracts
-	for _, provExtContractsGrp := range endpointGroup.ProvExtContractsGrps {
-		contractsGrp := contivModel.FindExtContractsGroup(provExtContractsGrp)
-		err = extContractsGrpDeregister(endpointGroup, contractsGrp, "provided")
-		if err != nil {
-			return err
-		}
-	}
-
-    return nil
-}
-
-func setupExternalContracts(endpointGroup *contivModel.EndpointGroup, consContractsGrps, provContractsGrps string[]) error {
-	// Validate presence and register consumed external contracts
-	for _, consExtContractsGrp := range consContractsGrps {
-		contractsGrp := contivModel.FindExtContractsGroup(consExtContractsGrp)
-		err = extContractsGrpValidateAndRegister(endpointGroup, contractsGrp, "consumed")
-		if err != nil {
-			return err
-		}
-	}
-
-	// Validate presence and register provided external contracts
-	for _, provExtContractsGrp := range provContractsGrps {
-		contractsGrp := contivModel.FindExtContractsGroup(provExtContractsGrp)
-		err = extContractsGrpValidateAndRegister(endpointGroup, contractsGrp, "provided")
-		if err != nil {
-			return err
-		}
-	}
-
-    return nil
-}
-*/
 // EndpointGroupCreate creates end point group
 func (ac *APIController) EndpointGroupCreate(endpointGroup *contivModel.EndpointGroup) error {
 	log.Infof("Received EndpointGroupCreate: %+v", endpointGroup)