Skip to content

Commit dadbf40

Browse files
rchirakkrchirakk
committed
add ip pool in endpoint group
1 parent d3aac3b commit dadbf40

File tree

7 files changed

+479
-440
lines changed

7 files changed

+479
-440
lines changed

‎client/contivModel.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ var EndpointGroupSummaryView = React.createClass({
252252
<ModalTrigger modal={<EndpointGroupModalView endpointGroup={ endpointGroup }/>}>
253253
<tr key={ endpointGroup.key } className="info">
254254

255-
255+
256256
</tr>
257257
</ModalTrigger>
258258
);
@@ -264,7 +264,7 @@ var EndpointGroupSummaryView = React.createClass({
264264
<thead>
265265
<tr>
266266

267-
267+
268268
</tr>
269269
</thead>
270270
<tbody>
@@ -288,6 +288,8 @@ var EndpointGroupModalView = React.createClass({
288288

289289
<Input type='text' label='Group name' ref='groupName' defaultValue={obj.groupName} placeholder='Group name' />
290290

291+
<Input type='text' label='IP-pool' ref='ipPool' defaultValue={obj.ipPool} placeholder='IP-pool' />
292+
291293
<Input type='text' label='Network profile name' ref='netProfile' defaultValue={obj.netProfile} placeholder='Network profile name' />
292294

293295
<Input type='text' label='Network' ref='networkName' defaultValue={obj.networkName} placeholder='Network' />

‎client/contivModelClient.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ type EndpointGroup struct {
319319

320320
ExtContractsGrps []string `json:"extContractsGrps,omitempty"`
321321
GroupName string `json:"groupName,omitempty"` // Group name
322+
IpPool string `json:"ipPool,omitempty"` // IP-pool
322323
NetProfile string `json:"netProfile,omitempty"` // Network profile name
323324
NetworkName string `json:"networkName,omitempty"` // Network
324325
Policies []string `json:"policies,omitempty"`
@@ -347,10 +348,12 @@ type EndpointGroupLinks struct {
347348

348349
// EndpointGroupOper runtime operations
349350
type EndpointGroupOper struct {
350-
Endpoints []EndpointOper `json:"endpoints,omitempty"`
351-
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
352-
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
353-
PktTag int `json:"pktTag,omitempty"` // internal packet tag
351+
AllocatedIPAddresses string `json:"allocatedIPAddresses,omitempty"` // allocated IP addresses
352+
AvailableIPAddresses string `json:"availableIPAddresses,omitempty"` // Available IP addresses
353+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
354+
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
355+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
356+
PktTag int `json:"pktTag,omitempty"` // internal packet tag
354357

355358
}
356359

‎client/contivModelClient.py

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ def createEndpointGroup(self, obj):
229229
jdata = json.dumps({
230230
"extContractsGrps": obj.extContractsGrps,
231231
"groupName": obj.groupName,
232+
"ipPool": obj.ipPool,
232233
"netProfile": obj.netProfile,
233234
"networkName": obj.networkName,
234235
"policies": obj.policies,

‎contivModel.go

+12-4
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ type EndpointGroup struct {
123123

124124
ExtContractsGrps []string `json:"extContractsGrps,omitempty"`
125125
GroupName string `json:"groupName,omitempty"` // Group name
126+
IpPool string `json:"ipPool,omitempty"` // IP-pool
126127
NetProfile string `json:"netProfile,omitempty"` // Network profile name
127128
NetworkName string `json:"networkName,omitempty"` // Network
128129
Policies []string `json:"policies,omitempty"`
@@ -154,10 +155,12 @@ type EndpointGroupLinks struct {
154155
}
155156

156157
type EndpointGroupOper struct {
157-
Endpoints []EndpointOper `json:"endpoints,omitempty"`
158-
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
159-
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
160-
PktTag int `json:"pktTag,omitempty"` // internal packet tag
158+
AllocatedIPAddresses string `json:"allocatedIPAddresses,omitempty"` // allocated IP addresses
159+
AvailableIPAddresses string `json:"availableIPAddresses,omitempty"` // Available IP addresses
160+
Endpoints []EndpointOper `json:"endpoints,omitempty"`
161+
ExternalPktTag int `json:"externalPktTag,omitempty"` // external packet tag
162+
NumEndpoints int `json:"numEndpoints,omitempty"` // number of endpoints
163+
PktTag int `json:"pktTag,omitempty"` // internal packet tag
161164

162165
}
163166

@@ -2435,6 +2438,11 @@ func ValidateEndpointGroup(obj *EndpointGroup) error {
24352438
return errors.New("groupName string invalid format")
24362439
}
24372440

2441+
ipPoolMatch := regexp.MustCompile("^$|^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\-((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))?$")
2442+
if ipPoolMatch.MatchString(obj.IpPool) == false {
2443+
return errors.New("ipPool string invalid format")
2444+
}
2445+
24382446
if len(obj.NetProfile) > 64 {
24392447
return errors.New("netProfile string too long")
24402448
}

‎endpointGroup.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
"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])$",
3131
"ShowSummary": true
3232
},
33+
"ipPool": {
34+
"type": "string",
35+
"format": "^$|^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3})(\\\\-((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}))?$",
36+
"title": "IP-pool",
37+
"showSummary": true
38+
},
3339
"policies": {
3440
"type": "array",
3541
"items": "string",
@@ -66,7 +72,16 @@
6672
"type": "array",
6773
"items": "endpoint",
6874
"title": "endpoints in the group"
69-
}
75+
},
76+
"allocatedIPAddresses": {
77+
"type": "string",
78+
"title": "allocated IP addresses"
79+
},
80+
"availableIPAddresses": {
81+
"type": "string",
82+
"title": "Available IP addresses"
83+
}
84+
7085
},
7186
"link-sets": {
7287
"services": {

0 commit comments

Comments
 (0)