Skip to content

Commit b91c6e6

Browse files
author
Joji Mekkatt
committed
Add an aci object plus utilize the updated modelgen
1 parent 5ebca49 commit b91c6e6

5 files changed

+759
-0
lines changed

‎aciGw.json

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"name": "contivModel",
3+
"objects": [
4+
{
5+
"name": "aciGw",
6+
"version": "v1",
7+
"type": "object",
8+
"key": [ "name"],
9+
"cfgProperties": {
10+
"name": {
11+
"type": "string",
12+
"title": "name of this block(must be 'aciGw')",
13+
"length": 64,
14+
"format": "^(aciGw)$",
15+
"ShowSummary": true
16+
},
17+
"pathBindings": {
18+
"type": "string",
19+
"title": "List of ACI fabric ports connected to cluster",
20+
"length": 2048,
21+
"format": "^$|^(topology/pod-[0-9]{1,4}/paths-[0-9]{1,4}/pathep-\\\\[eth[0-9]{1,2}/[0-9]{1,2}\\\\]){1}(,topology/pod-[0-9]{1,4}/paths-[0-9]{1,4}/pathep-\\\\[eth[0-9]{1,2}/[0-9]{1,2}\\\\])?$",
22+
"ShowSummary": true
23+
},
24+
"nodeBindings": {
25+
"type": "string",
26+
"title": "List of ACI complete nodes to be bound",
27+
"length": 2048,
28+
"format": "^$|^(topology/pod-[0-9]{1,4}/node-[0-9]{1,4}){1}(,topology/pod-[0-9]{1,4}/node-[0-9]{1,4})?$",
29+
"ShowSummary": true
30+
},
31+
"physicalDomain": {
32+
"type": "string",
33+
"title": "Name of the physical domain",
34+
"length": 128,
35+
"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])$"
36+
},
37+
"enforcePolicies": {
38+
"type": "string",
39+
"title": "Enforce security policy",
40+
"length": 64,
41+
"format": "^(yes|no){1}$",
42+
"ShowSummary": true
43+
},
44+
"includeCommonTenant": {
45+
"type": "string",
46+
"title": "Include common tenant when searching for objects",
47+
"length": 64,
48+
"format": "^(yes|no){1}$",
49+
"ShowSummary": true
50+
}
51+
},
52+
"operProperties": {
53+
"numAppProfiles": {
54+
"type": "int"
55+
}
56+
}
57+
}
58+
]
59+
}

‎client/contivModel.js

+65
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,71 @@
22
// This file is auto generated by modelgen tool
33
// Do not edit this file manually
44

5+
var AciGwSummaryView = React.createClass({
6+
render: function() {
7+
var self = this
8+
9+
// Walk thru all objects
10+
var aciGwListView = self.props.aciGws.map(function(aciGw){
11+
return (
12+
<ModalTrigger modal={<AciGwModalView aciGw={ aciGw }/>}>
13+
<tr key={ aciGw.key } className="info">
14+
15+
16+
</tr>
17+
</ModalTrigger>
18+
);
19+
});
20+
21+
return (
22+
<div>
23+
<Table hover>
24+
<thead>
25+
<tr>
26+
27+
28+
</tr>
29+
</thead>
30+
<tbody>
31+
{ aciGwListView }
32+
</tbody>
33+
</Table>
34+
</div>
35+
);
36+
}
37+
});
38+
39+
var AciGwModalView = React.createClass({
40+
render() {
41+
var obj = this.props.aciGw
42+
return (
43+
<Modal {...this.props} bsStyle='primary' bsSize='large' title='AciGw' animation={false}>
44+
<div className='modal-body' style={ {margin: '5%',} }>
45+
46+
47+
<Input type='text' label='Enforce security policy' ref='enforcePolicies' defaultValue={obj.enforcePolicies} placeholder='Enforce security policy' />
48+
49+
<Input type='text' label='Include common tenant when searching for objects' ref='includeCommonTenant' defaultValue={obj.includeCommonTenant} placeholder='Include common tenant when searching for objects' />
50+
51+
<Input type='text' label='name of this block(must be 'aciGw')' ref='name' defaultValue={obj.name} placeholder='name of this block(must be 'aciGw')' />
52+
53+
<Input type='text' label='List of ACI complete nodes to be bound' ref='nodeBindings' defaultValue={obj.nodeBindings} placeholder='List of ACI complete nodes to be bound' />
54+
55+
<Input type='text' label='List of ACI fabric ports connected to cluster' ref='pathBindings' defaultValue={obj.pathBindings} placeholder='List of ACI fabric ports connected to cluster' />
56+
57+
<Input type='text' label='Name of the physical domain' ref='physicalDomain' defaultValue={obj.physicalDomain} placeholder='Name of the physical domain' />
58+
59+
</div>
60+
<div className='modal-footer'>
61+
<Button onClick={this.props.onRequestHide}>Close</Button>
62+
</div>
63+
</Modal>
64+
);
65+
}
66+
});
67+
68+
module.exports.AciGwSummaryView = AciGwSummaryView
69+
module.exports.AciGwModalView = AciGwModalView
570
var AppProfileSummaryView = React.createClass({
671
render: function() {
772
var self = this

‎client/contivModelClient.go

+106
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,30 @@ func NewContivClient(baseURL string) (*ContivClient, error) {
146146
return &client, nil
147147
}
148148

149+
type AciGw struct {
150+
// every object has a key
151+
Key string `json:"key,omitempty"`
152+
153+
EnforcePolicies string `json:"enforcePolicies,omitempty"` // Enforce security policy
154+
IncludeCommonTenant string `json:"includeCommonTenant,omitempty"` // Include common tenant when searching for objects
155+
Name string `json:"name,omitempty"` // name of this block(must be 'aciGw')
156+
NodeBindings string `json:"nodeBindings,omitempty"` // List of ACI complete nodes to be bound
157+
PathBindings string `json:"pathBindings,omitempty"` // List of ACI fabric ports connected to cluster
158+
PhysicalDomain string `json:"physicalDomain,omitempty"` // Name of the physical domain
159+
160+
}
161+
162+
type AciGwOper struct {
163+
NumAppProfiles int `json:"numAppProfiles,omitempty"` //
164+
165+
}
166+
167+
type AciGwInspect struct {
168+
Config AciGw
169+
170+
Oper AciGwOper
171+
}
172+
149173
type AppProfile struct {
150174
// every object has a key
151175
Key string `json:"key,omitempty"`
@@ -585,6 +609,88 @@ type VolumeProfileInspect struct {
585609
Config VolumeProfile
586610
}
587611

612+
// AciGwPost posts the aciGw object
613+
func (c *ContivClient) AciGwPost(obj *AciGw) error {
614+
// build key and URL
615+
keyStr := obj.Name
616+
url := c.baseURL + "/api/v1/aciGws/" + keyStr + "/"
617+
618+
// http post the object
619+
err := httpPost(url, obj)
620+
if err != nil {
621+
log.Debugf("Error creating aciGw %+v. Err: %v", obj, err)
622+
return err
623+
}
624+
625+
return nil
626+
}
627+
628+
// AciGwList lists all aciGw objects
629+
func (c *ContivClient) AciGwList() (*[]*AciGw, error) {
630+
// build key and URL
631+
url := c.baseURL + "/api/v1/aciGws/"
632+
633+
// http get the object
634+
var objList []*AciGw
635+
err := httpGet(url, &objList)
636+
if err != nil {
637+
log.Debugf("Error getting aciGws. Err: %v", err)
638+
return nil, err
639+
}
640+
641+
return &objList, nil
642+
}
643+
644+
// AciGwGet gets the aciGw object
645+
func (c *ContivClient) AciGwGet(name string) (*AciGw, error) {
646+
// build key and URL
647+
keyStr := name
648+
url := c.baseURL + "/api/v1/aciGws/" + keyStr + "/"
649+
650+
// http get the object
651+
var obj AciGw
652+
err := httpGet(url, &obj)
653+
if err != nil {
654+
log.Debugf("Error getting aciGw %+v. Err: %v", keyStr, err)
655+
return nil, err
656+
}
657+
658+
return &obj, nil
659+
}
660+
661+
// AciGwDelete deletes the aciGw object
662+
func (c *ContivClient) AciGwDelete(name string) error {
663+
// build key and URL
664+
keyStr := name
665+
url := c.baseURL + "/api/v1/aciGws/" + keyStr + "/"
666+
667+
// http get the object
668+
err := httpDelete(url)
669+
if err != nil {
670+
log.Debugf("Error deleting aciGw %s. Err: %v", keyStr, err)
671+
return err
672+
}
673+
674+
return nil
675+
}
676+
677+
// AciGwInspect gets the aciGwInspect object
678+
func (c *ContivClient) AciGwInspect(name string) (*AciGwInspect, error) {
679+
// build key and URL
680+
keyStr := name
681+
url := c.baseURL + "/api/v1/inspect/aciGws/" + keyStr + "/"
682+
683+
// http get the object
684+
var obj AciGwInspect
685+
err := httpGet(url, &obj)
686+
if err != nil {
687+
log.Debugf("Error getting aciGw %+v. Err: %v", keyStr, err)
688+
return nil, err
689+
}
690+
691+
return &obj, nil
692+
}
693+
588694
// AppProfilePost posts the appProfile object
589695
func (c *ContivClient) AppProfilePost(obj *AppProfile) error {
590696
// build key and URL

‎client/contivModelClient.py

+50
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,56 @@ class objmodelClient:
7373
def __init__(self, baseUrl):
7474
self.baseUrl = baseUrl
7575

76+
# Create aciGw
77+
def createAciGw(self, obj):
78+
postUrl = self.baseUrl + '/api/v1/aciGws/' + obj.name + '/'
79+
80+
jdata = json.dumps({
81+
"enforcePolicies": obj.enforcePolicies,
82+
"includeCommonTenant": obj.includeCommonTenant,
83+
"name": obj.name,
84+
"nodeBindings": obj.nodeBindings,
85+
"pathBindings": obj.pathBindings,
86+
"physicalDomain": obj.physicalDomain,
87+
})
88+
89+
# Post the data
90+
response = httpPost(postUrl, jdata)
91+
92+
if response == "Error":
93+
errorExit("AciGw create failure")
94+
95+
# Delete aciGw
96+
def deleteAciGw(self, name):
97+
# Delete AciGw
98+
deleteUrl = self.baseUrl + '/api/v1/aciGws/' + name + '/'
99+
response = httpDelete(deleteUrl)
100+
101+
if response == "Error":
102+
errorExit("AciGw create failure")
103+
104+
# List all aciGw objects
105+
def listAciGw(self):
106+
# Get a list of aciGw objects
107+
retDate = urllib2.urlopen(self.baseUrl + '/api/v1/aciGws/')
108+
if retData == "Error":
109+
errorExit("list AciGw failed")
110+
111+
return json.loads(retData)
112+
113+
114+
115+
# Inspect aciGw
116+
def createAciGw(self, obj):
117+
postUrl = self.baseUrl + '/api/v1/inspect/aciGw/' + obj.name + '/'
118+
119+
retDate = urllib2.urlopen(postUrl)
120+
if retData == "Error":
121+
errorExit("list AciGw failed")
122+
123+
return json.loads(retData)
124+
125+
76126
# Create appProfile
77127
def createAppProfile(self, obj):
78128
postUrl = self.baseUrl + '/api/v1/appProfiles/' + obj.tenantName + ":" + obj.appProfileName + '/'

0 commit comments

Comments
 (0)