Skip to content

Commit

Permalink
change from/to epg/network in rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@shaleman
shaleman committed Feb 1, 2016
1 parent 1b5c36a commit 532d767
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 43 deletions.
36 changes: 27 additions & 9 deletions client/contivModel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,12 @@ var PolicyModalView = React.createClass({

<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />

<Input type='text' label='To Endpoint Group' ref='toEndpointGroup' defaultValue={obj.toEndpointGroup} placeholder='To Endpoint Group' />

<Input type='text' label='IP Address' ref='toIpAddress' defaultValue={obj.toIpAddress} placeholder='IP Address' />

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

</div>
<div className='modal-footer'>
<Button onClick={this.props.onRequestHide}>Close</Button>
Expand All @@ -415,10 +421,12 @@ var RuleSummaryView = React.createClass({

<td>{ rule.direction }</td>

<td>{ rule.endpointGroup }</td>
<td>{ rule.fromEndpointGroup }</td>

<td>{ rule.fromIpAddress }</td>

<td>{ rule.fromNetwork }</td>

<td>{ rule.ipAddress }</td>

<td>{ rule.policyName }</td>

<td>{ rule.port }</td>
Expand All @@ -430,6 +438,12 @@ var RuleSummaryView = React.createClass({
<td>{ rule.ruleId }</td>

<td>{ rule.tenantName }</td>

<td>{ rule.toEndpointGroup }</td>

<td>{ rule.toIpAddress }</td>

<td>{ rule.toNetwork }</td>

</tr>
</ModalTrigger>
Expand All @@ -445,14 +459,18 @@ var RuleSummaryView = React.createClass({

<th> Action </th>
<th> Direction </th>
<th> Group </th>
<th> IP Address </th>
<th> From Endpoint Group </th>
<th> IP Address </th>
<th> From Network </th>
<th> Policy Name </th>
<th> Port No </th>
<th> Priority </th>
<th> Protocol </th>
<th> Rule Id </th>
<th> Tenant Name </th>
<th> Tenant Name </th>
<th> To Endpoint Group </th>
<th> IP Address </th>
<th> To Network </th>
</tr>
</thead>
<tbody>
Expand All @@ -476,11 +494,11 @@ var RuleModalView = React.createClass({

<Input type='text' label='Direction' ref='direction' defaultValue={obj.direction} placeholder='Direction' />

<Input type='text' label='Group' ref='endpointGroup' defaultValue={obj.endpointGroup} placeholder='Group' />
<Input type='text' label='From Endpoint Group' ref='fromEndpointGroup' defaultValue={obj.fromEndpointGroup} placeholder='From Endpoint Group' />

<Input type='text' label='IP Address' ref='ipAddress' defaultValue={obj.ipAddress} placeholder='IP Address' />
<Input type='text' label='IP Address' ref='fromIpAddress' defaultValue={obj.fromIpAddress} placeholder='IP Address' />

<Input type='text' label='Network Name' ref='network' defaultValue={obj.network} placeholder='Network Name' />
<Input type='text' label='From Network' ref='fromNetwork' defaultValue={obj.fromNetwork} placeholder='From Network' />

<Input type='text' label='Policy Name' ref='policyName' defaultValue={obj.policyName} placeholder='Policy Name' />

Expand Down
25 changes: 14 additions & 11 deletions client/contivModelClient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,17 +234,20 @@ type Rule struct {
// every object has a key
Key string `json:"key,omitempty"`

Action string `json:"action,omitempty"` // Action
Direction string `json:"direction,omitempty"` // Direction
EndpointGroup string `json:"endpointGroup,omitempty"` // Group
IpAddress string `json:"ipAddress,omitempty"` // IP Address
Network string `json:"network,omitempty"` // Network Name
PolicyName string `json:"policyName,omitempty"` // Policy Name
Port int `json:"port,omitempty"` // Port No
Priority int `json:"priority,omitempty"` // Priority
Protocol string `json:"protocol,omitempty"` // Protocol
RuleID string `json:"ruleId,omitempty"` // Rule Id
TenantName string `json:"tenantName,omitempty"` // Tenant Name
Action string `json:"action,omitempty"` // Action
Direction string `json:"direction,omitempty"` // Direction
FromEndpointGroup string `json:"fromEndpointGroup,omitempty"` // From Endpoint Group
FromIpAddress string `json:"fromIpAddress,omitempty"` // IP Address
FromNetwork string `json:"fromNetwork,omitempty"` // From Network
PolicyName string `json:"policyName,omitempty"` // Policy Name
Port int `json:"port,omitempty"` // Port No
Priority int `json:"priority,omitempty"` // Priority
Protocol string `json:"protocol,omitempty"` // Protocol
RuleID string `json:"ruleId,omitempty"` // Rule Id
TenantName string `json:"tenantName,omitempty"` // Tenant Name
ToEndpointGroup string `json:"toEndpointGroup,omitempty"` // To Endpoint Group
ToIpAddress string `json:"toIpAddress,omitempty"` // IP Address
ToNetwork string `json:"toNetwork,omitempty"` // To Network

// add link-sets and links
LinkSets RuleLinkSets `json:"link-sets,omitempty"`
Expand Down
9 changes: 6 additions & 3 deletions client/contivModelClient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,18 @@ def createRule(self, obj):
jdata = json.dumps({
"action": obj.action,
"direction": obj.direction,
"endpointGroup": obj.endpointGroup,
"ipAddress": obj.ipAddress,
"network": obj.network,
"fromEndpointGroup": obj.fromEndpointGroup,
"fromIpAddress": obj.fromIpAddress,
"fromNetwork": obj.fromNetwork,
"policyName": obj.policyName,
"port": obj.port,
"priority": obj.priority,
"protocol": obj.protocol,
"ruleId": obj.ruleId,
"tenantName": obj.tenantName,
"toEndpointGroup": obj.toEndpointGroup,
"toIpAddress": obj.toIpAddress,
"toNetwork": obj.toNetwork,
})

# Post the data
Expand Down
41 changes: 26 additions & 15 deletions contivModel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,20 @@ type Rule struct {
// every object has a key
Key string `json:"key,omitempty"`

Action string `json:"action,omitempty"` // Action
Direction string `json:"direction,omitempty"` // Direction
EndpointGroup string `json:"endpointGroup,omitempty"` // Group
IpAddress string `json:"ipAddress,omitempty"` // IP Address
Network string `json:"network,omitempty"` // Network Name
PolicyName string `json:"policyName,omitempty"` // Policy Name
Port int `json:"port,omitempty"` // Port No
Priority int `json:"priority,omitempty"` // Priority
Protocol string `json:"protocol,omitempty"` // Protocol
RuleID string `json:"ruleId,omitempty"` // Rule Id
TenantName string `json:"tenantName,omitempty"` // Tenant Name
Action string `json:"action,omitempty"` // Action
Direction string `json:"direction,omitempty"` // Direction
FromEndpointGroup string `json:"fromEndpointGroup,omitempty"` // From Endpoint Group
FromIpAddress string `json:"fromIpAddress,omitempty"` // IP Address
FromNetwork string `json:"fromNetwork,omitempty"` // From Network
PolicyName string `json:"policyName,omitempty"` // Policy Name
Port int `json:"port,omitempty"` // Port No
Priority int `json:"priority,omitempty"` // Priority
Protocol string `json:"protocol,omitempty"` // Protocol
RuleID string `json:"ruleId,omitempty"` // Rule Id
TenantName string `json:"tenantName,omitempty"` // Tenant Name
ToEndpointGroup string `json:"toEndpointGroup,omitempty"` // To Endpoint Group
ToIpAddress string `json:"toIpAddress,omitempty"` // IP Address
ToNetwork string `json:"toNetwork,omitempty"` // To Network

// add link-sets and links
LinkSets RuleLinkSets `json:"link-sets,omitempty"`
Expand Down Expand Up @@ -1839,6 +1842,14 @@ func ValidateNetwork(obj *Network) error {
return errors.New("tenantName string too long")
}

if len(obj.ToEndpointGroup) > 64 {
return errors.New("toEndpointGroup string too long")
}

if len(obj.ToNetwork) > 64 {
return errors.New("toNetwork string too long")
}

return nil
}

Expand Down Expand Up @@ -2317,12 +2328,12 @@ func ValidateRule(obj *Rule) error {
return errors.New("direction string invalid format")
}

if len(obj.EndpointGroup) > 64 {
return errors.New("endpointGroup string too long")
if len(obj.FromEndpointGroup) > 64 {
return errors.New("fromEndpointGroup string too long")
}

if len(obj.Network) > 64 {
return errors.New("network string too long")
if len(obj.FromNetwork) > 64 {
return errors.New("fromNetwork string too long")
}

if len(obj.PolicyName) > 64 {
Expand Down
28 changes: 23 additions & 5 deletions rule.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,36 @@
"title": "Priority",
"showSummary": true
},
"endpointGroup": {
"fromEndpointGroup": {
"type": "string",
"length": 64,
"title": "Group",
"title": "From Endpoint Group",
"showSummary": true
},
"network": {
"toEndpointGroup": {
"type": "string",
"length": 64,
"title": "Network Name"
"title": "To Endpoint Group",
"showSummary": true
},
"fromNetwork": {
"type": "string",
"length": 64,
"title": "From Network",
"showSummary": true
},
"toNetwork": {
"type": "string",
"length": 64,
"title": "To Network",
"showSummary": true
},
"fromIpAddress": {
"type": "string",
"title": "IP Address",
"showSummary": true
},
"ipAddress": {
"toIpAddress": {
"type": "string",
"title": "IP Address",
"showSummary": true
Expand Down

0 comments on commit 532d767

Please sign in to comment.