Merge pull request #425 from gaurav-dalvi/issue-423

shaleman · web-flow · commit 5698e1b52abe · 2016-06-23T17:43:30.000-07:00
issue-423- commit-1
diff --git a/netmaster/objApi/apiController.go b/netmaster/objApi/apiController.go
@@ -231,10 +231,6 @@ func (ac *APIController) AppProfileCreate(prof *contivModel.AppProfile) error {
 		return core.Errorf("Tenant %s not found", prof.TenantName)
 	}
 
-	// Setup links
-	modeldb.AddLink(&prof.Links.Tenant, tenant)
-	modeldb.AddLinkSet(&tenant.LinkSets.AppProfiles, prof)
-
 	for _, epg := range prof.EndpointGroups {
 		epgKey := prof.TenantName + ":" + epg
 		epgObj := contivModel.FindEndpointGroup(epgKey)
@@ -250,6 +246,10 @@ func (ac *APIController) AppProfileCreate(prof *contivModel.AppProfile) error {
 		}
 	}
 
+	// Setup links
+	modeldb.AddLink(&prof.Links.Tenant, tenant)
+	modeldb.AddLinkSet(&tenant.LinkSets.AppProfiles, prof)
+
 	err := tenant.Write()
 	if err != nil {
 		log.Errorf("Error updating tenant state(%+v). Err: %v", tenant, err)

Original file line number	Diff line number	Diff line change
`@@ -231,10 +231,6 @@ func (ac APIController) AppProfileCreate(prof contivModel.AppProfile) error {`
`231`	`231`	`return core.Errorf("Tenant %s not found", prof.TenantName)`
`232`	`232`	`}`
`233`	`233`
`234`		`- // Setup links`
`235`		`- modeldb.AddLink(&prof.Links.Tenant, tenant)`
`236`		`- modeldb.AddLinkSet(&tenant.LinkSets.AppProfiles, prof)`
`237`		`-`
`238`	`234`	`for _, epg := range prof.EndpointGroups {`
`239`	`235`	`epgKey := prof.TenantName + ":" + epg`
`240`	`236`	`epgObj := contivModel.FindEndpointGroup(epgKey)`
`@@ -250,6 +246,10 @@ func (ac APIController) AppProfileCreate(prof contivModel.AppProfile) error {`
`250`	`246`	`}`
`251`	`247`	`}`
`252`	`248`
	`249`	`+ // Setup links`
	`250`	`+ modeldb.AddLink(&prof.Links.Tenant, tenant)`
	`251`	`+ modeldb.AddLinkSet(&tenant.LinkSets.AppProfiles, prof)`
	`252`	`+`
`253`	`253`	`err := tenant.Write()`
`254`	`254`	`if err != nil {`
`255`	`255`	`log.Errorf("Error updating tenant state(%+v). Err: %v", tenant, err)`