service load balance

Author: abhi

client/contivModelClient.go

@@ -11,15 +11,11 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"github.com/contiv/objdb/modeldb"
+
 	log "github.com/Sirupsen/logrus"
 )
 
-// Link is a one way relattion between two objects
-type Link struct {
-	ObjType string `json:"type,omitempty"`
-	ObjKey  string `json:"key,omitempty"`
-}
-
 func httpGet(url string, jdata interface{}) error {
 
 	r, err := http.Get(url)
@@ -161,12 +157,12 @@ type AppProfile struct {
 }
 
 type AppProfileLinkSets struct {
-	EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
+	EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
 }
 
 type AppProfileLinks struct {
-	Network Link `json:"Network,omitempty"`
-	Tenant  Link `json:"Tenant,omitempty"`
+	Network modeldb.Link `json:"Network,omitempty"`
+	Tenant  modeldb.Link `json:"Tenant,omitempty"`
 }
 
 type EndpointGroup struct {
@@ -185,14 +181,14 @@ type EndpointGroup struct {
 }
 
 type EndpointGroupLinkSets struct {
-	Policies map[string]Link `json:"Policies,omitempty"`
-	Services map[string]Link `json:"Services,omitempty"`
+	Policies map[string]modeldb.Link `json:"Policies,omitempty"`
+	Services map[string]modeldb.Link `json:"Services,omitempty"`
 }
 
 type EndpointGroupLinks struct {
-	AppProfile Link `json:"AppProfile,omitempty"`
-	Network    Link `json:"Network,omitempty"`
-	Tenant     Link `json:"Tenant,omitempty"`
+	AppProfile modeldb.Link `json:"AppProfile,omitempty"`
+	Network    modeldb.Link `json:"Network,omitempty"`
+	Tenant     modeldb.Link `json:"Tenant,omitempty"`
 }
 
 type Global struct {
@@ -236,13 +232,13 @@ type Network struct {
 }
 
 type NetworkLinkSets struct {
-	AppProfiles    map[string]Link `json:"AppProfiles,omitempty"`
-	EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
-	Services       map[string]Link `json:"Services,omitempty"`
+	AppProfiles    map[string]modeldb.Link `json:"AppProfiles,omitempty"`
+	EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
+	Services       map[string]modeldb.Link `json:"Services,omitempty"`
 }
 
 type NetworkLinks struct {
-	Tenant Link `json:"Tenant,omitempty"`
+	Tenant modeldb.Link `json:"Tenant,omitempty"`
 }
 
 type Policy struct {
@@ -258,12 +254,12 @@ type Policy struct {
 }
 
 type PolicyLinkSets struct {
-	EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
-	Rules          map[string]Link `json:"Rules,omitempty"`
+	EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
+	Rules          map[string]modeldb.Link `json:"Rules,omitempty"`
 }
 
 type PolicyLinks struct {
-	Tenant Link `json:"Tenant,omitempty"`
+	Tenant modeldb.Link `json:"Tenant,omitempty"`
 }
 
 type Rule struct {
@@ -290,7 +286,7 @@ type Rule struct {
 }
 
 type RuleLinkSets struct {
-	Policies map[string]Link `json:"Policies,omitempty"`
+	Policies map[string]modeldb.Link `json:"Policies,omitempty"`
 }
 
 type Service struct {
@@ -316,14 +312,14 @@ type Service struct {
 }
 
 type ServiceLinkSets struct {
-	EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
-	Instances      map[string]Link `json:"Instances,omitempty"`
-	Networks       map[string]Link `json:"Networks,omitempty"`
+	EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
+	Instances      map[string]modeldb.Link `json:"Instances,omitempty"`
+	Networks       map[string]modeldb.Link `json:"Networks,omitempty"`
 }
 
 type ServiceLinks struct {
-	App           Link `json:"App,omitempty"`
-	VolumeProfile Link `json:"VolumeProfile,omitempty"`
+	App           modeldb.Link `json:"App,omitempty"`
+	VolumeProfile modeldb.Link `json:"VolumeProfile,omitempty"`
 }
 
 type ServiceInstance struct {
@@ -342,11 +338,11 @@ type ServiceInstance struct {
 }
 
 type ServiceInstanceLinkSets struct {
-	Volumes map[string]Link `json:"Volumes,omitempty"`
+	Volumes map[string]modeldb.Link `json:"Volumes,omitempty"`
 }
 
 type ServiceInstanceLinks struct {
-	Service Link `json:"Service,omitempty"`
+	Service modeldb.Link `json:"Service,omitempty"`
 }
 
 type ServiceLB struct {
@@ -374,12 +370,12 @@ type Tenant struct {
 }
 
 type TenantLinkSets struct {
-	AppProfiles    map[string]Link `json:"AppProfiles,omitempty"`
-	EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
-	Networks       map[string]Link `json:"Networks,omitempty"`
-	Policies       map[string]Link `json:"Policies,omitempty"`
-	VolumeProfiles map[string]Link `json:"VolumeProfiles,omitempty"`
-	Volumes        map[string]Link `json:"Volumes,omitempty"`
+	AppProfiles    map[string]modeldb.Link `json:"AppProfiles,omitempty"`
+	EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
+	Networks       map[string]modeldb.Link `json:"Networks,omitempty"`
+	Policies       map[string]modeldb.Link `json:"Policies,omitempty"`
+	VolumeProfiles map[string]modeldb.Link `json:"VolumeProfiles,omitempty"`
+	Volumes        map[string]modeldb.Link `json:"Volumes,omitempty"`
 }
 
 type Volume struct {
@@ -399,11 +395,11 @@ type Volume struct {
 }
 
 type VolumeLinkSets struct {
-	ServiceInstances map[string]Link `json:"ServiceInstances,omitempty"`
+	ServiceInstances map[string]modeldb.Link `json:"ServiceInstances,omitempty"`
 }
 
 type VolumeLinks struct {
-	Tenant Link `json:"Tenant,omitempty"`
+	Tenant modeldb.Link `json:"Tenant,omitempty"`
 }
 
 type VolumeProfile struct {
@@ -423,11 +419,11 @@ type VolumeProfile struct {
 }
 
 type VolumeProfileLinkSets struct {
-	Services map[string]Link `json:"Services,omitempty"`
+	Services map[string]modeldb.Link `json:"Services,omitempty"`
 }
 
 type VolumeProfileLinks struct {
-	Tenant Link `json:"Tenant,omitempty"`
+	Tenant modeldb.Link `json:"Tenant,omitempty"`
 }
 
 // AppProfilePost posts the appProfile object

client/contivModelClient.py

@@ -218,6 +218,7 @@ def createNetwork(self, obj):
 			"encap": obj.encap, 
 			"gateway": obj.gateway, 
 			"networkName": obj.networkName, 
+			"nwType": obj.nwType, 
 			"pktTag": obj.pktTag, 
 			"subnet": obj.subnet, 
 			"tenantName": obj.tenantName,