add versioning in api, other fixes

Author: Vipin Jain

client/contivModelClient.go

@@ -492,7 +492,7 @@ func (c *ContivClient) AppProfileGet(tenantName string, appProfileName string) (
 	return &obj, nil
 }
 
-// AppProfileGetInspect gets the appProfileInspect object
+// AppProfileInspect gets the appProfileInspect object
 func (c *ContivClient) AppProfileInspect(tenantName string, appProfileName string) (*AppProfileInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + appProfileName
@@ -574,7 +574,7 @@ func (c *ContivClient) BgpGet(hostname string) (*Bgp, error) {
 	return &obj, nil
 }
 
-// BgpGetInspect gets the BgpInspect object
+// BgpInspect gets the BgpInspect object
 func (c *ContivClient) BgpInspect(hostname string) (*BgpInspect, error) {
 	// build key and URL
 	keyStr := hostname
@@ -656,7 +656,7 @@ func (c *ContivClient) EndpointGroupGet(tenantName string, groupName string) (*E
 	return &obj, nil
 }
 
-// EndpointGroupGetInspect gets the endpointGroupInspect object
+// EndpointGroupInspect gets the endpointGroupInspect object
 func (c *ContivClient) EndpointGroupInspect(tenantName string, groupName string) (*EndpointGroupInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + groupName
@@ -803,7 +803,7 @@ func (c *ContivClient) GlobalGet(name string) (*Global, error) {
 	return &obj, nil
 }
 
-// GlobalGetInspect gets the globalInspect object
+// GlobalInspect gets the globalInspect object
 func (c *ContivClient) GlobalInspect(name string) (*GlobalInspect, error) {
 	// build key and URL
 	keyStr := name
@@ -885,7 +885,7 @@ func (c *ContivClient) NetworkGet(tenantName string, networkName string) (*Netwo
 	return &obj, nil
 }
 
-// NetworkGetInspect gets the networkInspect object
+// NetworkInspect gets the networkInspect object
 func (c *ContivClient) NetworkInspect(tenantName string, networkName string) (*NetworkInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + networkName
@@ -967,7 +967,7 @@ func (c *ContivClient) PolicyGet(tenantName string, policyName string) (*Policy,
 	return &obj, nil
 }
 
-// PolicyGetInspect gets the policyInspect object
+// PolicyInspect gets the policyInspect object
 func (c *ContivClient) PolicyInspect(tenantName string, policyName string) (*PolicyInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + policyName
@@ -1049,7 +1049,7 @@ func (c *ContivClient) RuleGet(tenantName string, policyName string, ruleId stri
 	return &obj, nil
 }
 
-// RuleGetInspect gets the ruleInspect object
+// RuleInspect gets the ruleInspect object
 func (c *ContivClient) RuleInspect(tenantName string, policyName string, ruleId string) (*RuleInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + policyName + ":" + ruleId
@@ -1131,7 +1131,7 @@ func (c *ContivClient) ServiceLBGet(tenantName string, serviceName string) (*Ser
 	return &obj, nil
 }
 
-// ServiceLBGetInspect gets the serviceLBInspect object
+// ServiceLBInspect gets the serviceLBInspect object
 func (c *ContivClient) ServiceLBInspect(tenantName string, serviceName string) (*ServiceLBInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + serviceName
@@ -1213,7 +1213,7 @@ func (c *ContivClient) TenantGet(tenantName string) (*Tenant, error) {
 	return &obj, nil
 }
 
-// TenantGetInspect gets the tenantInspect object
+// TenantInspect gets the tenantInspect object
 func (c *ContivClient) TenantInspect(tenantName string) (*TenantInspect, error) {
 	// build key and URL
 	keyStr := tenantName
@@ -1295,7 +1295,7 @@ func (c *ContivClient) VolumeGet(tenantName string, volumeName string) (*Volume,
 	return &obj, nil
 }
 
-// VolumeGetInspect gets the volumeInspect object
+// VolumeInspect gets the volumeInspect object
 func (c *ContivClient) VolumeInspect(tenantName string, volumeName string) (*VolumeInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + volumeName
@@ -1377,7 +1377,7 @@ func (c *ContivClient) VolumeProfileGet(tenantName string, volumeProfileName str
 	return &obj, nil
 }
 
-// VolumeProfileGetInspect gets the volumeProfileInspect object
+// VolumeProfileInspect gets the volumeProfileInspect object
 func (c *ContivClient) VolumeProfileInspect(tenantName string, volumeProfileName string) (*VolumeProfileInspect, error) {
 	// build key and URL
 	keyStr := tenantName + ":" + volumeProfileName

client/contivModelClient.py

@@ -74,7 +74,7 @@ def __init__(self, baseUrl):
 		self.baseUrl = baseUrl
 	# Create appProfile
 	def createAppProfile(self, obj):
-	    postUrl = self.baseUrl + '/api/appProfiles/' + obj.tenantName + ":" + obj.appProfileName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/appProfiles/' + obj.tenantName + ":" + obj.appProfileName  + '/'
 
 	    jdata = json.dumps({ 
 			"appProfileName": obj.appProfileName, 
@@ -91,7 +91,7 @@ def createAppProfile(self, obj):
 	# Delete appProfile
 	def deleteAppProfile(self, tenantName, appProfileName):
 	    # Delete AppProfile
-	    deleteUrl = self.baseUrl + '/api/appProfiles/' + tenantName + ":" + appProfileName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/appProfiles/' + tenantName + ":" + appProfileName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -100,14 +100,14 @@ def deleteAppProfile(self, tenantName, appProfileName):
 	# List all appProfile objects
 	def listAppProfile(self):
 	    # Get a list of appProfile objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/appProfiles/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/appProfiles/')
 	    if retData == "Error":
 	        errorExit("list AppProfile failed")
 
 	    return json.loads(retData)
 	# Create Bgp
 	def createBgp(self, obj):
-	    postUrl = self.baseUrl + '/api/Bgps/' + obj.hostname  + '/'
+	    postUrl = self.baseUrl + '/api/v1/Bgps/' + obj.hostname  + '/'
 
 	    jdata = json.dumps({ 
 			"as": obj.as, 
@@ -126,7 +126,7 @@ def createBgp(self, obj):
 	# Delete Bgp
 	def deleteBgp(self, hostname):
 	    # Delete Bgp
-	    deleteUrl = self.baseUrl + '/api/Bgps/' + hostname  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/Bgps/' + hostname  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -135,14 +135,14 @@ def deleteBgp(self, hostname):
 	# List all Bgp objects
 	def listBgp(self):
 	    # Get a list of Bgp objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/Bgps/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/Bgps/')
 	    if retData == "Error":
 	        errorExit("list Bgp failed")
 
 	    return json.loads(retData)
 	# Create endpointGroup
 	def createEndpointGroup(self, obj):
-	    postUrl = self.baseUrl + '/api/endpointGroups/' + obj.tenantName + ":" + obj.groupName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/endpointGroups/' + obj.tenantName + ":" + obj.groupName  + '/'
 
 	    jdata = json.dumps({ 
 			"extContractsGrps": obj.extContractsGrps, 
@@ -161,7 +161,7 @@ def createEndpointGroup(self, obj):
 	# Delete endpointGroup
 	def deleteEndpointGroup(self, tenantName, groupName):
 	    # Delete EndpointGroup
-	    deleteUrl = self.baseUrl + '/api/endpointGroups/' + tenantName + ":" + groupName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/endpointGroups/' + tenantName + ":" + groupName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -170,7 +170,7 @@ def deleteEndpointGroup(self, tenantName, groupName):
 	# List all endpointGroup objects
 	def listEndpointGroup(self):
 	    # Get a list of endpointGroup objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/endpointGroups/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/endpointGroups/')
 	    if retData == "Error":
 	        errorExit("list EndpointGroup failed")
 
@@ -211,7 +211,7 @@ def listExtContractsGroup(self):
 	    return json.loads(retData)
 	# Create global
 	def createGlobal(self, obj):
-	    postUrl = self.baseUrl + '/api/globals/' + obj.name  + '/'
+	    postUrl = self.baseUrl + '/api/v1/globals/' + obj.name  + '/'
 
 	    jdata = json.dumps({ 
 			"name": obj.name, 
@@ -229,7 +229,7 @@ def createGlobal(self, obj):
 	# Delete global
 	def deleteGlobal(self, name):
 	    # Delete Global
-	    deleteUrl = self.baseUrl + '/api/globals/' + name  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/globals/' + name  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -238,14 +238,14 @@ def deleteGlobal(self, name):
 	# List all global objects
 	def listGlobal(self):
 	    # Get a list of global objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/globals/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/globals/')
 	    if retData == "Error":
 	        errorExit("list Global failed")
 
 	    return json.loads(retData)
 	# Create network
 	def createNetwork(self, obj):
-	    postUrl = self.baseUrl + '/api/networks/' + obj.tenantName + ":" + obj.networkName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/networks/' + obj.tenantName + ":" + obj.networkName  + '/'
 
 	    jdata = json.dumps({ 
 			"encap": obj.encap, 
@@ -268,7 +268,7 @@ def createNetwork(self, obj):
 	# Delete network
 	def deleteNetwork(self, tenantName, networkName):
 	    # Delete Network
-	    deleteUrl = self.baseUrl + '/api/networks/' + tenantName + ":" + networkName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/networks/' + tenantName + ":" + networkName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -277,14 +277,14 @@ def deleteNetwork(self, tenantName, networkName):
 	# List all network objects
 	def listNetwork(self):
 	    # Get a list of network objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/networks/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/networks/')
 	    if retData == "Error":
 	        errorExit("list Network failed")
 
 	    return json.loads(retData)
 	# Create policy
 	def createPolicy(self, obj):
-	    postUrl = self.baseUrl + '/api/policys/' + obj.tenantName + ":" + obj.policyName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/policys/' + obj.tenantName + ":" + obj.policyName  + '/'
 
 	    jdata = json.dumps({ 
 			"policyName": obj.policyName, 
@@ -300,7 +300,7 @@ def createPolicy(self, obj):
 	# Delete policy
 	def deletePolicy(self, tenantName, policyName):
 	    # Delete Policy
-	    deleteUrl = self.baseUrl + '/api/policys/' + tenantName + ":" + policyName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/policys/' + tenantName + ":" + policyName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -309,14 +309,14 @@ def deletePolicy(self, tenantName, policyName):
 	# List all policy objects
 	def listPolicy(self):
 	    # Get a list of policy objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/policys/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/policys/')
 	    if retData == "Error":
 	        errorExit("list Policy failed")
 
 	    return json.loads(retData)
 	# Create rule
 	def createRule(self, obj):
-	    postUrl = self.baseUrl + '/api/rules/' + obj.tenantName + ":" + obj.policyName + ":" + obj.ruleId  + '/'
+	    postUrl = self.baseUrl + '/api/v1/rules/' + obj.tenantName + ":" + obj.policyName + ":" + obj.ruleId  + '/'
 
 	    jdata = json.dumps({ 
 			"action": obj.action, 
@@ -344,7 +344,7 @@ def createRule(self, obj):
 	# Delete rule
 	def deleteRule(self, tenantName, policyName, ruleId):
 	    # Delete Rule
-	    deleteUrl = self.baseUrl + '/api/rules/' + tenantName + ":" + policyName + ":" + ruleId  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/rules/' + tenantName + ":" + policyName + ":" + ruleId  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -353,14 +353,14 @@ def deleteRule(self, tenantName, policyName, ruleId):
 	# List all rule objects
 	def listRule(self):
 	    # Get a list of rule objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/rules/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/rules/')
 	    if retData == "Error":
 	        errorExit("list Rule failed")
 
 	    return json.loads(retData)
 	# Create serviceLB
 	def createServiceLB(self, obj):
-	    postUrl = self.baseUrl + '/api/serviceLBs/' + obj.tenantName + ":" + obj.serviceName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/serviceLBs/' + obj.tenantName + ":" + obj.serviceName  + '/'
 
 	    jdata = json.dumps({ 
 			"ipAddress": obj.ipAddress, 
@@ -380,7 +380,7 @@ def createServiceLB(self, obj):
 	# Delete serviceLB
 	def deleteServiceLB(self, tenantName, serviceName):
 	    # Delete ServiceLB
-	    deleteUrl = self.baseUrl + '/api/serviceLBs/' + tenantName + ":" + serviceName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/serviceLBs/' + tenantName + ":" + serviceName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -389,14 +389,14 @@ def deleteServiceLB(self, tenantName, serviceName):
 	# List all serviceLB objects
 	def listServiceLB(self):
 	    # Get a list of serviceLB objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/serviceLBs/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/serviceLBs/')
 	    if retData == "Error":
 	        errorExit("list ServiceLB failed")
 
 	    return json.loads(retData)
 	# Create tenant
 	def createTenant(self, obj):
-	    postUrl = self.baseUrl + '/api/tenants/' + obj.tenantName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/tenants/' + obj.tenantName  + '/'
 
 	    jdata = json.dumps({ 
 			"defaultNetwork": obj.defaultNetwork, 
@@ -412,7 +412,7 @@ def createTenant(self, obj):
 	# Delete tenant
 	def deleteTenant(self, tenantName):
 	    # Delete Tenant
-	    deleteUrl = self.baseUrl + '/api/tenants/' + tenantName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/tenants/' + tenantName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -421,14 +421,14 @@ def deleteTenant(self, tenantName):
 	# List all tenant objects
 	def listTenant(self):
 	    # Get a list of tenant objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/tenants/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/tenants/')
 	    if retData == "Error":
 	        errorExit("list Tenant failed")
 
 	    return json.loads(retData)
 	# Create volume
 	def createVolume(self, obj):
-	    postUrl = self.baseUrl + '/api/volumes/' + obj.tenantName + ":" + obj.volumeName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/volumes/' + obj.tenantName + ":" + obj.volumeName  + '/'
 
 	    jdata = json.dumps({ 
 			"datastoreType": obj.datastoreType, 
@@ -448,7 +448,7 @@ def createVolume(self, obj):
 	# Delete volume
 	def deleteVolume(self, tenantName, volumeName):
 	    # Delete Volume
-	    deleteUrl = self.baseUrl + '/api/volumes/' + tenantName + ":" + volumeName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/volumes/' + tenantName + ":" + volumeName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -457,14 +457,14 @@ def deleteVolume(self, tenantName, volumeName):
 	# List all volume objects
 	def listVolume(self):
 	    # Get a list of volume objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/volumes/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/volumes/')
 	    if retData == "Error":
 	        errorExit("list Volume failed")
 
 	    return json.loads(retData)
 	# Create volumeProfile
 	def createVolumeProfile(self, obj):
-	    postUrl = self.baseUrl + '/api/volumeProfiles/' + obj.tenantName + ":" + obj.volumeProfileName  + '/'
+	    postUrl = self.baseUrl + '/api/v1/volumeProfiles/' + obj.tenantName + ":" + obj.volumeProfileName  + '/'
 
 	    jdata = json.dumps({ 
 			"datastoreType": obj.datastoreType, 
@@ -484,7 +484,7 @@ def createVolumeProfile(self, obj):
 	# Delete volumeProfile
 	def deleteVolumeProfile(self, tenantName, volumeProfileName):
 	    # Delete VolumeProfile
-	    deleteUrl = self.baseUrl + '/api/volumeProfiles/' + tenantName + ":" + volumeProfileName  + '/'
+	    deleteUrl = self.baseUrl + '/api/v1/volumeProfiles/' + tenantName + ":" + volumeProfileName  + '/'
 	    response = httpDelete(deleteUrl)
 
 	    if response == "Error":
@@ -493,7 +493,7 @@ def deleteVolumeProfile(self, tenantName, volumeProfileName):
 	# List all volumeProfile objects
 	def listVolumeProfile(self):
 	    # Get a list of volumeProfile objects
-	    retDate = urllib2.urlopen(self.baseUrl + '/api/volumeProfiles/')
+	    retDate = urllib2.urlopen(self.baseUrl + '/api/v1/volumeProfiles/')
 	    if retData == "Error":
 	        errorExit("list VolumeProfile failed")