Skip to content

Commit 5d20bfb

Browse files
saramachshaleman
saramach
authored and
shaleman
committed
Support for external contracts (provided and consumed) for ACI (#24)
* Support for external contracts (provided and consumed) for ACI * Add tenant as part of the key for external contracts object * Just have a single link-set for all contract groups * Just have a single external contracts array at the epg level. * Add validators for contracts group name and tenant name for the external contracts object
1 parent e2527ca commit 5d20bfb

6 files changed

+584
-36
lines changed

‎client/contivModel.js

+75
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ var EndpointGroupSummaryView = React.createClass({
135135
<tr key={ endpointGroup.key } className="info">
136136

137137

138+
<td>{ endpointGroup.extContractsGrps }</td>
139+
138140
<td>{ endpointGroup.groupName }</td>
139141

140142
<td>{ endpointGroup.networkName }</td>
@@ -153,6 +155,7 @@ var EndpointGroupSummaryView = React.createClass({
153155
<tr>
154156

155157

158+
<th> External contracts </th>
156159
<th> Group name </th>
157160
<th> Network </th>
158161
<th> Policies </th>
@@ -175,6 +178,8 @@ var EndpointGroupModalView = React.createClass({
175178
<div className='modal-body' style={ {margin: '5%',} }>
176179

177180

181+
<Input type='text' label='External contracts' ref='extContractsGrps' defaultValue={obj.extContractsGrps} placeholder='External contracts' />
182+
178183
<Input type='text' label='Group name' ref='groupName' defaultValue={obj.groupName} placeholder='Group name' />
179184

180185
<Input type='text' label='Network' ref='networkName' defaultValue={obj.networkName} placeholder='Network' />
@@ -194,6 +199,76 @@ var EndpointGroupModalView = React.createClass({
194199

195200
module.exports.EndpointGroupSummaryView = EndpointGroupSummaryView
196201
module.exports.EndpointGroupModalView = EndpointGroupModalView
202+
var ExtContractsGroupSummaryView = React.createClass({
203+
render: function() {
204+
var self = this
205+
206+
// Walk thru all objects
207+
var extContractsGroupListView = self.props.extContractsGroups.map(function(extContractsGroup){
208+
return (
209+
<ModalTrigger modal={<ExtContractsGroupModalView extContractsGroup={ extContractsGroup }/>}>
210+
<tr key={ extContractsGroup.key } className="info">
211+
212+
213+
<td>{ extContractsGroup.contractsGroupName }</td>
214+
215+
<td>{ extContractsGroup.contractsType }</td>
216+
217+
<td>{ extContractsGroup.tenantName }</td>
218+
219+
</tr>
220+
</ModalTrigger>
221+
);
222+
});
223+
224+
return (
225+
<div>
226+
<Table hover>
227+
<thead>
228+
<tr>
229+
230+
231+
<th> Contracts group name </th>
232+
<th> Contracts type </th>
233+
<th> Tenant name </th>
234+
</tr>
235+
</thead>
236+
<tbody>
237+
{ extContractsGroupListView }
238+
</tbody>
239+
</Table>
240+
</div>
241+
);
242+
}
243+
});
244+
245+
var ExtContractsGroupModalView = React.createClass({
246+
render() {
247+
var obj = this.props.extContractsGroup
248+
return (
249+
<Modal {...this.props} bsStyle='primary' bsSize='large' title='ExtContractsGroup' animation={false}>
250+
<div className='modal-body' style={ {margin: '5%',} }>
251+
252+
253+
<Input type='text' label='Contracts list' ref='contracts' defaultValue={obj.contracts} placeholder='Contracts list' />
254+
255+
<Input type='text' label='Contracts group name' ref='contractsGroupName' defaultValue={obj.contractsGroupName} placeholder='Contracts group name' />
256+
257+
<Input type='text' label='Contracts type' ref='contractsType' defaultValue={obj.contractsType} placeholder='Contracts type' />
258+
259+
<Input type='text' label='Tenant name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant name' />
260+
261+
</div>
262+
<div className='modal-footer'>
263+
<Button onClick={this.props.onRequestHide}>Close</Button>
264+
</div>
265+
</Modal>
266+
);
267+
}
268+
});
269+
270+
module.exports.ExtContractsGroupSummaryView = ExtContractsGroupSummaryView
271+
module.exports.ExtContractsGroupModalView = ExtContractsGroupModalView
197272
var GlobalSummaryView = React.createClass({
198273
render: function() {
199274
var self = this

‎client/contivModelClient.go

+90-6
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,21 @@ type EndpointGroup struct {
183183
// every object has a key
184184
Key string `json:"key,omitempty"`
185185

186-
GroupName string `json:"groupName,omitempty"` // Group name
187-
NetworkName string `json:"networkName,omitempty"` // Network
188-
Policies []string `json:"policies,omitempty"`
189-
TenantName string `json:"tenantName,omitempty"` // Tenant
186+
ExtContractsGrps []string `json:"extContractsGrps,omitempty"`
187+
GroupName string `json:"groupName,omitempty"` // Group name
188+
NetworkName string `json:"networkName,omitempty"` // Network
189+
Policies []string `json:"policies,omitempty"`
190+
TenantName string `json:"tenantName,omitempty"` // Tenant
190191

191192
// add link-sets and links
192193
LinkSets EndpointGroupLinkSets `json:"link-sets,omitempty"`
193194
Links EndpointGroupLinks `json:"links,omitempty"`
194195
}
195196

196197
type EndpointGroupLinkSets struct {
197-
Policies map[string]Link `json:"Policies,omitempty"`
198-
Services map[string]Link `json:"Services,omitempty"`
198+
ExtContractsGrps map[string]Link `json:"ExtContractsGrps,omitempty"`
199+
Policies map[string]Link `json:"Policies,omitempty"`
200+
Services map[string]Link `json:"Services,omitempty"`
199201
}
200202

201203
type EndpointGroupLinks struct {
@@ -204,6 +206,23 @@ type EndpointGroupLinks struct {
204206
Tenant Link `json:"Tenant,omitempty"`
205207
}
206208

209+
type ExtContractsGroup struct {
210+
// every object has a key
211+
Key string `json:"key,omitempty"`
212+
213+
Contracts []string `json:"contracts,omitempty"`
214+
ContractsGroupName string `json:"contractsGroupName,omitempty"` // Contracts group name
215+
ContractsType string `json:"contractsType,omitempty"` // Contracts type
216+
TenantName string `json:"tenantName,omitempty"` // Tenant name
217+
218+
// add link-sets and links
219+
LinkSets ExtContractsGroupLinkSets `json:"link-sets,omitempty"`
220+
}
221+
222+
type ExtContractsGroupLinkSets struct {
223+
EndpointGroups map[string]Link `json:"EndpointGroups,omitempty"`
224+
}
225+
207226
type Global struct {
208227
// every object has a key
209228
Key string `json:"key,omitempty"`
@@ -575,6 +594,71 @@ func (c *ContivClient) EndpointGroupDelete(tenantName string, groupName string)
575594
return nil
576595
}
577596

597+
// ExtContractsGroupPost posts the extContractsGroup object
598+
func (c *ContivClient) ExtContractsGroupPost(obj *ExtContractsGroup) error {
599+
// build key and URL
600+
keyStr := obj.TenantName + ":" + obj.ContractsGroupName
601+
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
602+
603+
// http post the object
604+
err := httpPost(url, obj)
605+
if err != nil {
606+
log.Debugf("Error creating extContractsGroup %+v. Err: %v", obj, err)
607+
return err
608+
}
609+
610+
return nil
611+
}
612+
613+
// ExtContractsGroupList lists all extContractsGroup objects
614+
func (c *ContivClient) ExtContractsGroupList() (*[]*ExtContractsGroup, error) {
615+
// build key and URL
616+
url := c.baseURL + "/api/extContractsGroups/"
617+
618+
// http get the object
619+
var objList []*ExtContractsGroup
620+
err := httpGet(url, &objList)
621+
if err != nil {
622+
log.Debugf("Error getting extContractsGroups. Err: %v", err)
623+
return nil, err
624+
}
625+
626+
return &objList, nil
627+
}
628+
629+
// ExtContractsGroupGet gets the extContractsGroup object
630+
func (c *ContivClient) ExtContractsGroupGet(tenantName string, contractsGroupName string) (*ExtContractsGroup, error) {
631+
// build key and URL
632+
keyStr := tenantName + ":" + contractsGroupName
633+
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
634+
635+
// http get the object
636+
var obj ExtContractsGroup
637+
err := httpGet(url, &obj)
638+
if err != nil {
639+
log.Debugf("Error getting extContractsGroup %+v. Err: %v", keyStr, err)
640+
return nil, err
641+
}
642+
643+
return &obj, nil
644+
}
645+
646+
// ExtContractsGroupDelete deletes the extContractsGroup object
647+
func (c *ContivClient) ExtContractsGroupDelete(tenantName string, contractsGroupName string) error {
648+
// build key and URL
649+
keyStr := tenantName + ":" + contractsGroupName
650+
url := c.baseURL + "/api/extContractsGroups/" + keyStr + "/"
651+
652+
// http get the object
653+
err := httpDelete(url)
654+
if err != nil {
655+
log.Debugf("Error deleting extContractsGroup %s. Err: %v", keyStr, err)
656+
return err
657+
}
658+
659+
return nil
660+
}
661+
578662
// GlobalPost posts the global object
579663
func (c *ContivClient) GlobalPost(obj *Global) error {
580664
// build key and URL

‎client/contivModelClient.py

+35
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ def createEndpointGroup(self, obj):
145145
postUrl = self.baseUrl + '/api/endpointGroups/' + obj.tenantName + ":" + obj.groupName + '/'
146146

147147
jdata = json.dumps({
148+
"extContractsGrps": obj.extContractsGrps,
148149
"groupName": obj.groupName,
149150
"networkName": obj.networkName,
150151
"policies": obj.policies,
@@ -173,6 +174,40 @@ def listEndpointGroup(self):
173174
if retData == "Error":
174175
errorExit("list EndpointGroup failed")
175176

177+
return json.loads(retData)
178+
# Create extContractsGroup
179+
def createExtContractsGroup(self, obj):
180+
postUrl = self.baseUrl + '/api/extContractsGroups/' + obj.tenantName + ":" + obj.contractsGroupName + '/'
181+
182+
jdata = json.dumps({
183+
"contracts": obj.contracts,
184+
"contractsGroupName": obj.contractsGroupName,
185+
"contractsType": obj.contractsType,
186+
"tenantName": obj.tenantName,
187+
})
188+
189+
# Post the data
190+
response = httpPost(postUrl, jdata)
191+
192+
if response == "Error":
193+
errorExit("ExtContractsGroup create failure")
194+
195+
# Delete extContractsGroup
196+
def deleteExtContractsGroup(self, tenantName, contractsGroupName):
197+
# Delete ExtContractsGroup
198+
deleteUrl = self.baseUrl + '/api/extContractsGroups/' + tenantName + ":" + contractsGroupName + '/'
199+
response = httpDelete(deleteUrl)
200+
201+
if response == "Error":
202+
errorExit("ExtContractsGroup create failure")
203+
204+
# List all extContractsGroup objects
205+
def listExtContractsGroup(self):
206+
# Get a list of extContractsGroup objects
207+
retDate = urllib2.urlopen(self.baseUrl + '/api/extContractsGroups/')
208+
if retData == "Error":
209+
errorExit("list ExtContractsGroup failed")
210+
176211
return json.loads(retData)
177212
# Create global
178213
def createGlobal(self, obj):

0 commit comments

Comments
 (0)