Fixing Issue#360 (#363)

Author: gaurav-dalvi

netmaster/objApi/apiController.go

@@ -364,18 +364,8 @@ func (ac *APIController) EndpointGroupCreate(endpointGroup *contivModel.Endpoint
 		return core.Errorf("Tenant not found")
 	}
 
-	// Setup links
-	modeldb.AddLink(&endpointGroup.Links.Tenant, tenant)
-	modeldb.AddLinkSet(&tenant.LinkSets.EndpointGroups, endpointGroup)
-
-	// Save the tenant too since we added the links
-	err := tenant.Write()
-	if err != nil {
-		return err
-	}
-
 	// create the endpoint group state
-	err = master.CreateEndpointGroup(endpointGroup.TenantName, endpointGroup.NetworkName,
+	err := master.CreateEndpointGroup(endpointGroup.TenantName, endpointGroup.NetworkName,
 		endpointGroup.GroupName, endpointGroup.EndpointGroupID)
 	if err != nil {
 		log.Errorf("Error creating endpoing group %+v. Err: %v", endpointGroup, err)
@@ -410,6 +400,16 @@ func (ac *APIController) EndpointGroupCreate(endpointGroup *contivModel.Endpoint
 		}
 	}
 
+	// Setup links
+	modeldb.AddLink(&endpointGroup.Links.Tenant, tenant)
+	modeldb.AddLinkSet(&tenant.LinkSets.EndpointGroups, endpointGroup)
+
+	// Save the tenant too since we added the links
+	err = tenant.Write()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -550,17 +550,6 @@ func (ac *APIController) NetworkCreate(network *contivModel.Network) error {
 		return core.Errorf("Tenant not found")
 	}
 
-	// Setup links
-	modeldb.AddLink(&network.Links.Tenant, tenant)
-	modeldb.AddLinkSet(&tenant.LinkSets.Networks, network)
-
-	// Save the tenant too since we added the links
-	err := tenant.Write()
-	if err != nil {
-		log.Errorf("Error updating tenant state(%+v). Err: %v", tenant, err)
-		return err
-	}
-
 	// Get the state driver
 	stateDriver, err := utils.GetStateDriver()
 	if err != nil {
@@ -584,6 +573,17 @@ func (ac *APIController) NetworkCreate(network *contivModel.Network) error {
 		return err
 	}
 
+	// Setup links
+	modeldb.AddLink(&network.Links.Tenant, tenant)
+	modeldb.AddLinkSet(&tenant.LinkSets.Networks, network)
+
+	// Save the tenant too since we added the links
+	err = tenant.Write()
+	if err != nil {
+		log.Errorf("Error updating tenant state(%+v). Err: %v", tenant, err)
+		return err
+	}
+
 	return nil
 }