Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DO NOT MERGE: New k8s nw policy #1119

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

DO NOT MERGE: New k8s nw policy #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f35897b
initial attempt to add to/from tenant for rules
chrisplo Jan 17, 2018
f99ad54
tenant to/from support and new ofnet
chrisplo Jan 18, 2018
fdd08a6
to/from contivmodel tenant name optional
chrisplo Jan 18, 2018
6d9ca29
tenant ingress is working
chrisplo Jan 19, 2018
8c45213
WIP upgrading ofnet to k8s ready
chrisplo Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 50 additions & 50 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ k8s-l3-destroy:

# ===================================================================
# kubernetes dev
k8s-dev: checks-with-docker compile-with-docker binaries-from-container
k8s-dev: compile-with-docker binaries-from-container
CONTIV_TEST="dev" make k8s-cluster

# kubernetes test targets
Expand Down
0 contivmodel/.gitignore → contivModel/.gitignore
View file
Open in desktop
File renamed without changes.
0 contivmodel/LICENSE → contivModel/LICENSE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion contivmodel/Makefile → contivModel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ godep:
godep save ./...

modelgen:
@if [ -z "`which modelgen`" ]; then go get -v github.com/contiv/modelgen; fi
@go get -u -v github.com/contiv/modelgen

# systemtest runs all of the systemtests
systemtests:
Expand Down
0 contivmodel/README.md → contivModel/README.md
View file
Open in desktop
File renamed without changes.
0 contivmodel/aciGw.json → contivModel/aciGw.json
View file
Open in desktop
File renamed without changes.
0 contivmodel/appProfile.json → contivModel/appProfile.json
View file
Open in desktop
File renamed without changes.
0 contivmodel/bgphost.json → contivModel/bgphost.json
View file
Open in desktop
File renamed without changes.
12 changes: 8 additions & 4 deletions contivmodel/client/contivModel.js → contivModel/client/contivModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ var RuleSummaryView = React.createClass({
<ModalTrigger modal={<RuleModalView rule={ rule }/>}>
<tr key={ rule.key } className="info">


</tr>
</ModalTrigger>
);
Expand All @@ -654,7 +654,7 @@ var RuleSummaryView = React.createClass({
<thead>
<tr>


</tr>
</thead>
<tbody>
Expand All @@ -680,10 +680,12 @@ var RuleModalView = React.createClass({

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

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

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

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

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

<Input type='text' label='Port No' ref='port' defaultValue={obj.port} placeholder='Port No' />
Expand All @@ -698,10 +700,12 @@ var RuleModalView = React.createClass({

<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 IP Address' ref='toIpAddress' defaultValue={obj.toIpAddress} placeholder='To IP Address' />

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

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

</div>
<div className='modal-footer'>
<Button onClick={this.props.onRequestHide}>Close</Button>
Expand Down
Loading