infra nw support (#340)

* revert and update only godeps * fix for unit-test failure * infra nw support * update comments, add system tests * fixed gofmt
contiv · May 4, 2016 · e5d85eb · e5d85eb
1 parent fbf248a
commit e5d85eb
Show file tree

Hide file tree

Showing 26 changed files with 456 additions and 169 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModel.js b/Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModel.js
diff --git a/Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModelClient.go b/Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModelClient.go
diff --git a/Godeps/_workspace/src/github.com/contiv/contivmodel/contivModel.go b/Godeps/_workspace/src/github.com/contiv/contivmodel/contivModel.go
diff --git a/Godeps/_workspace/src/github.com/contiv/contivmodel/network.json b/Godeps/_workspace/src/github.com/contiv/contivmodel/network.json
diff --git a/Godeps/_workspace/src/github.com/contiv/ofnet/ofnetAgent.go b/Godeps/_workspace/src/github.com/contiv/ofnet/ofnetAgent.go
diff --git a/core/core.go b/core/core.go
@@ -106,7 +106,7 @@ type NetworkDriver interface {
 	Init(instInfo *InstanceInfo) error
 	Deinit()
 	CreateNetwork(id string) error
-	DeleteNetwork(id, encap string, pktTag, extPktTag int, gateway string, tenant string) error
+	DeleteNetwork(id, nwType, encap string, pktTag, extPktTag int, gateway string, tenant string) error
 	CreateEndpoint(id string) error
 	DeleteEndpoint(id string) error
 	AddPeerHost(node ServiceInfo) error

diff --git a/drivers/fakenetepdriver.go b/drivers/fakenetepdriver.go
@@ -26,7 +26,7 @@ func (d *FakeNetEpDriver) CreateNetwork(id string) error {
 }
 
 // DeleteNetwork is not implemented.
-func (d *FakeNetEpDriver) DeleteNetwork(id, encap string, pktTag, extPktTag int, gateway string, tenant string) error {
+func (d *FakeNetEpDriver) DeleteNetwork(id, nwType, encap string, pktTag, extPktTag int, gateway string, tenant string) error {
 	return core.Errorf("Not implemented")
 }