Skip to content

Commit 17a909c

Browse files
author
Vipin Jain
committed
add version to external contracts object
1 parent bbba353 commit 17a909c

4 files changed

+99
-66
lines changed

‎client/contivModelClient.go

+25-4
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ type ExtContractsGroupLinkSets struct {
235235
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
236236
}
237237

238+
type ExtContractsGroupInspect struct {
239+
Config ExtContractsGroup
240+
}
241+
238242
type Global struct {
239243
// every object has a key
240244
Key string `json:"key,omitempty"`
@@ -716,7 +720,7 @@ func (c *ContivClient) EndpointGroupDelete(tenantName string, groupName string)
716720
func (c *ContivClient) ExtContractsGroupPost(obj *ExtContractsGroup) error {
717721
// build key and URL
718722
keyStr := obj.TenantName + ":" + obj.ContractsGroupName
719-
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
723+
url := c.baseURL + "/api/v1/extContractsGroups/" + keyStr + "/"
720724

721725
// http post the object
722726
err := httpPost(url, obj)
@@ -731,7 +735,7 @@ func (c *ContivClient) ExtContractsGroupPost(obj *ExtContractsGroup) error {
731735
// ExtContractsGroupList lists all extContractsGroup objects
732736
func (c *ContivClient) ExtContractsGroupList() (*[]*ExtContractsGroup, error) {
733737
// build key and URL
734-
url := c.baseURL + "/api/extContractsGroups/"
738+
url := c.baseURL + "/api/v1/extContractsGroups/"
735739

736740
// http get the object
737741
var objList []*ExtContractsGroup
@@ -748,7 +752,7 @@ func (c *ContivClient) ExtContractsGroupList() (*[]*ExtContractsGroup, error) {
748752
func (c *ContivClient) ExtContractsGroupGet(tenantName string, contractsGroupName string) (*ExtContractsGroup, error) {
749753
// build key and URL
750754
keyStr := tenantName + ":" + contractsGroupName
751-
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
755+
url := c.baseURL + "/api/v1/extContractsGroups/" + keyStr + "/"
752756

753757
// http get the object
754758
var obj ExtContractsGroup
@@ -761,11 +765,28 @@ func (c *ContivClient) ExtContractsGroupGet(tenantName string, contractsGroupNam
761765
return &obj, nil
762766
}
763767

768+
// ExtContractsGroupInspect gets the extContractsGroupInspect object
769+
func (c *ContivClient) ExtContractsGroupInspect(tenantName string, contractsGroupName string) (*ExtContractsGroupInspect, error) {
770+
// build key and URL
771+
keyStr := tenantName + ":" + contractsGroupName
772+
url := c.baseURL + "/api/v1/inspect/extContractsGroups/" + keyStr + "/"
773+
774+
// http get the object
775+
var obj ExtContractsGroupInspect
776+
err := httpGet(url, &obj)
777+
if err != nil {
778+
log.Debugf("Error getting extContractsGroup %+v. Err: %v", keyStr, err)
779+
return nil, err
780+
}
781+
782+
return &obj, nil
783+
}
784+
764785
// ExtContractsGroupDelete deletes the extContractsGroup object
765786
func (c *ContivClient) ExtContractsGroupDelete(tenantName string, contractsGroupName string) error {
766787
// build key and URL
767788
keyStr := tenantName + ":" + contractsGroupName
768-
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
789+
url := c.baseURL + "/api/v1/extContractsGroups/" + keyStr + "/"
769790

770791
// http get the object
771792
err := httpDelete(url)

‎client/contivModelClient.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def listEndpointGroup(self):
177177
return json.loads(retData)
178178
# Create extContractsGroup
179179
def createExtContractsGroup(self, obj):
180-
postUrl = self.baseUrl + '/api/extContractsGroups/' + obj.tenantName + ":" + obj.contractsGroupName + '/'
180+
postUrl = self.baseUrl + '/api/v1/extContractsGroups/' + obj.tenantName + ":" + obj.contractsGroupName + '/'
181181

182182
jdata = json.dumps({
183183
"contracts": obj.contracts,
@@ -195,7 +195,7 @@ def createExtContractsGroup(self, obj):
195195
# Delete extContractsGroup
196196
def deleteExtContractsGroup(self, tenantName, contractsGroupName):
197197
# Delete ExtContractsGroup
198-
deleteUrl = self.baseUrl + '/api/extContractsGroups/' + tenantName + ":" + contractsGroupName + '/'
198+
deleteUrl = self.baseUrl + '/api/v1/extContractsGroups/' + tenantName + ":" + contractsGroupName + '/'
199199
response = httpDelete(deleteUrl)
200200

201201
if response == "Error":
@@ -204,7 +204,7 @@ def deleteExtContractsGroup(self, tenantName, contractsGroupName):
204204
# List all extContractsGroup objects
205205
def listExtContractsGroup(self):
206206
# Get a list of extContractsGroup objects
207-
retDate = urllib2.urlopen(self.baseUrl + '/api/extContractsGroups/')
207+
retDate = urllib2.urlopen(self.baseUrl + '/api/v1/extContractsGroups/')
208208
if retData == "Error":
209209
errorExit("list ExtContractsGroup failed")
210210

‎contivModel.go

+27-16
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,6 @@ type EndpointGroup struct {
6969
Links EndpointGroupLinks `json:"links,omitempty"`
7070
}
7171

72-
type EndpointGroupLinkSets struct {
73-
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
74-
Services map[string]modeldb.Link `json:"Services,omitempty"`
75-
}
76-
77-
type EndpointGroupLinks struct {
78-
AppProfile modeldb.Link `json:"AppProfile,omitempty"`
79-
Network modeldb.Link `json:"Network,omitempty"`
80-
Tenant modeldb.Link `json:"Tenant,omitempty"`
81-
}
82-
8372
type EndpointGroupLinkSets struct {
8473
ExtContractsGrps map[string]modeldb.Link `json:"ExtContractsGrps,omitempty"`
8574
Policies map[string]modeldb.Link `json:"Policies,omitempty"`
@@ -92,6 +81,9 @@ type EndpointGroupLinks struct {
9281
Tenant modeldb.Link `json:"Tenant,omitempty"`
9382
}
9483

84+
type EndpointGroupInspect struct {
85+
Config EndpointGroup
86+
}
9587
type ExtContractsGroup struct {
9688
// every object has a key
9789
Key string `json:"key,omitempty"`
@@ -109,10 +101,9 @@ type ExtContractsGroupLinkSets struct {
109101
EndpointGroups map[string]modeldb.Link `json:"EndpointGroups,omitempty"`
110102
}
111103

112-
type EndpointGroupInspect struct {
113-
Config EndpointGroup
104+
type ExtContractsGroupInspect struct {
105+
Config ExtContractsGroup
114106
}
115-
116107
type Global struct {
117108
// every object has a key
118109
Key string `json:"key,omitempty"`
@@ -597,14 +588,16 @@ func AddRoutes(router *mux.Router) {
597588
router.Path(inspectRoute).Methods("GET").HandlerFunc(makeHttpHandler(httpInspectEndpointGroup))
598589

599590
// Register extContractsGroup
600-
route = "/api/extContractsGroups/{key}/"
601-
listRoute = "/api/extContractsGroups/"
591+
route = "/api/v1/extContractsGroups/{key}/"
592+
listRoute = "/api/v1/extContractsGroups/"
593+
inspectRoute = "/api/v1/inspect/extContractsGroups/{key}/"
602594
log.Infof("Registering %s", route)
603595
router.Path(listRoute).Methods("GET").HandlerFunc(makeHttpHandler(httpListExtContractsGroups))
604596
router.Path(route).Methods("GET").HandlerFunc(makeHttpHandler(httpGetExtContractsGroup))
605597
router.Path(route).Methods("POST").HandlerFunc(makeHttpHandler(httpCreateExtContractsGroup))
606598
router.Path(route).Methods("PUT").HandlerFunc(makeHttpHandler(httpCreateExtContractsGroup))
607599
router.Path(route).Methods("DELETE").HandlerFunc(makeHttpHandler(httpDeleteExtContractsGroup))
600+
router.Path(inspectRoute).Methods("GET").HandlerFunc(makeHttpHandler(httpInspectExtContractsGroup))
608601

609602
// Register global
610603
route = "/api/v1/globals/{key}/"
@@ -1584,6 +1577,24 @@ func httpGetExtContractsGroup(w http.ResponseWriter, r *http.Request, vars map[s
15841577
return obj, nil
15851578
}
15861579

1580+
// GET Oper REST call
1581+
func httpInspectExtContractsGroup(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
1582+
var obj ExtContractsGroupInspect
1583+
log.Debugf("Received httpInspectExtContractsGroup: %+v", vars)
1584+
1585+
key := vars["key"]
1586+
1587+
objConfig := collections.extContractsGroups[key]
1588+
if objConfig == nil {
1589+
log.Errorf("extContractsGroup %s not found", key)
1590+
return nil, errors.New("extContractsGroup not found")
1591+
}
1592+
obj.Config = *objConfig
1593+
1594+
// Return the obj
1595+
return &obj, nil
1596+
}
1597+
15871598
// CREATE REST call
15881599
func httpCreateExtContractsGroup(w http.ResponseWriter, r *http.Request, vars map[string]string) (interface{}, error) {
15891600
log.Debugf("Received httpGetExtContractsGroup: %+v", vars)

‎extContractsGroup.json

+44-43
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
{
2-
"name": "contivModel",
3-
"objects": [
4-
{
5-
"name": "extContractsGroup",
6-
"type": "object",
7-
"key": [ "tenantName", "contractsGroupName" ],
8-
"properties": {
9-
"tenantName": {
10-
"type": "string",
11-
"title": "Tenant name",
12-
"description": "Tenant name",
13-
"length": 64,
14-
"format": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\\\-]*[A-Za-z0-9])$",
15-
"showSummary": true
16-
},
17-
"contractsGroupName": {
18-
"type": "string",
19-
"description": "Contracts group name",
20-
"length": 64,
21-
"format": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\\\-]*[A-Za-z0-9])$",
22-
"title": "Contracts group name",
23-
"showSummary": true
24-
},
25-
"contractsType": {
26-
"type": "string",
27-
"description": "Contracts type (Provided -or- Consumed)",
28-
"title": "Contracts type",
29-
"showSummary": true
30-
},
31-
"contracts": {
32-
"type": "array",
33-
"items": "string",
34-
"description": "List of contracts provided or consumed",
35-
"title": "Contracts list"
36-
}
37-
},
38-
"link-sets": {
39-
"endpointGroups": {
40-
"ref": "endpointGroup"
41-
}
42-
}
43-
}
44-
]
2+
"name": "contivModel",
3+
"objects": [
4+
{
5+
"name": "extContractsGroup",
6+
"version": "v1",
7+
"type": "object",
8+
"key": [ "tenantName", "contractsGroupName" ],
9+
"cfgProperties": {
10+
"tenantName": {
11+
"type": "string",
12+
"title": "Tenant name",
13+
"description": "Tenant name",
14+
"length": 64,
15+
"format": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\\\-]*[A-Za-z0-9])$",
16+
"showSummary": true
17+
},
18+
"contractsGroupName": {
19+
"type": "string",
20+
"description": "Contracts group name",
21+
"length": 64,
22+
"format": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\\\-]*[a-zA-Z0-9])\\\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\\\-]*[A-Za-z0-9])$",
23+
"title": "Contracts group name",
24+
"showSummary": true
25+
},
26+
"contractsType": {
27+
"type": "string",
28+
"description": "Contracts type (Provided -or- Consumed)",
29+
"title": "Contracts type",
30+
"showSummary": true
31+
},
32+
"contracts": {
33+
"type": "array",
34+
"items": "string",
35+
"description": "List of contracts provided or consumed",
36+
"title": "Contracts list"
37+
}
38+
},
39+
"link-sets": {
40+
"endpointGroups": {
41+
"ref": "endpointGroup"
42+
}
43+
}
44+
}
45+
]
4546
}

0 commit comments

Comments
 (0)