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

Fixes #541 #578

Merged
merged 9 commits into from
Oct 28, 2016
Merged

Fixes #541 #578

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6f44dbf
Merge pull request #1 from contiv/master
srampal Oct 11, 2016
d94c6ad
Fixes #541
srampal Oct 13, 2016
14ed835
Triggering CI
srampal Oct 14, 2016
eb216fe
3rd try retriggering CI
srampal Oct 14, 2016
0a6b2ee
4th try retriggering CI
srampal Oct 14, 2016
e809168
Updates based on PR review comments
srampal Oct 25, 2016
859b19b
re-triggering CI
srampal Oct 25, 2016
1ceb3b4
Merge from main contiv project
srampal Oct 25, 2016
434986e
Final tiny tweaks based on review
srampal Oct 28, 2016
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
2 changes: 1 addition & 1 deletion test/systemtests/aci_util.go
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
// EPSpec for aci-gw
type EPSpec struct {
Tenant string `json:"tenant,omitempty"`
App string `json:"app,omitempty"`
App string `json:"app-prof,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srampal i hope this change was intentional ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@abhinandanpb : This is not related to the issue we are seeing here. This was found in my aci-gw feature. As it was online change I asked Sanjeev to incorporate in this PR.

Epg string `json:"epg,omitempty"`
EpMac string `json:"epmac,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion test/systemtests/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func (s *systemtestSuite) testNetworkAddDeleteWithDns(c *C, encap string) {
/*
Now that the networks are created, check that there is a dns endpoint on each network
*/
_, err = s.testNetworkInspectDNS("default", netName)
_, err = s.checkNetworkInspectDNS("default", netName)
c.Assert(err, IsNil)
}

Expand Down
2 changes: 1 addition & 1 deletion test/systemtests/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ func (s *systemtestSuite) verifyIPs(ipaddrs []string) error {
}

/* Confirm network inspect includes a dns endpoint (assumes this is the only endpoint on the network currently) */
func (s *systemtestSuite) testNetworkInspectDNS(tenant, network string) (bool, error) {
func (s *systemtestSuite) checkNetworkInspectDNS(tenant, network string) (bool, error) {

netInspect, err := s.cli.NetworkInspect(tenant, network)
// Network inspect must succeed
Expand Down