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

Support two types of network. #55

Merged
merged 5 commits into from
Jul 3, 2018
Merged

Support two types of network. #55

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
c6ee4c3
Support clusterwise create network
Jul 2, 2018
6c8591a
Support the delete ovs network for clusterwise
Jul 2, 2018
962f81d
Refine the testing
Jul 2, 2018
a4f9250
Remove bson
Jul 3, 2018
e047613
Wrap the networktype to a standalone struct type
Jul 3, 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
22 changes: 15 additions & 7 deletions src/entity/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,26 @@ import (
"gopkg.in/mgo.v2/bson"
)

type NetworkType string

const (
OVSNetworkType NetworkType = "ovs"
FakeNetworkType NetworkType = "fake"
Copy link

Choose a reason for hiding this comment

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

thank you, that's great

)

const (
NetworkCollectionName string = "networks"
)

type Network struct {
ID bson.ObjectId `bson:"_id,omitempty" json:"id"`
Type string `bson:"type" json:"type"`
Name string `bson:"name" json:"name"`
NodeName string `bson:"nodeName" json:"nodeName"`
CreatedAt *time.Time `bson:"createdAt,omitempty" json:"createdAt,omitempty"`
OVS OVSNetwork `bson:"ovs,omitempty" json:"ovs"`
Fake FakeNetwork `bson:"fake,omitempty" json:"fake"` //FakeNetwork, for restful testing.
ID bson.ObjectId `bson:"_id,omitempty" json:"id"`
Type NetworkType `bson:"type" json:"type"`
Name string `bson:"name" json:"name"`
Clusterwise bool `bson:"clusterwise" json:"clusterwise"`
NodeName string `bson:"nodeName,omitempty" json:"nodeName,omitempty"`
CreatedAt *time.Time `bson:"createdAt,omitempty" json:"createdAt,omitempty"`
OVS OVSNetwork `bson:"ovs,omitempty" json:"ovs"`
Fake FakeNetwork `json:"fake"` //FakeNetwork, for restful testing.
}

//GetCollection - get model mongo collection name.
Expand Down
12 changes: 6 additions & 6 deletions src/networkprovider/fake_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

func TestNetworkValidateBeforeCreating(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{
FakeParameter: "yes",
},
Expand All @@ -22,7 +22,7 @@ func TestNetworkValidateBeforeCreating(t *testing.T) {

func TestFakeNetworkCreating(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{
FakeParameter: "yes",
IWantFail: false,
Expand All @@ -35,7 +35,7 @@ func TestFakeNetworkCreating(t *testing.T) {

func TestFakeNetworkValidateBeforeCreatingFail(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{
FakeParameter: "",
},
Expand All @@ -47,7 +47,7 @@ func TestFakeNetworkValidateBeforeCreatingFail(t *testing.T) {

func TestFakeNetworkCreatingFail(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{
IWantFail: true,
},
Expand All @@ -59,7 +59,7 @@ func TestFakeNetworkCreatingFail(t *testing.T) {

func TestFakeNetworkDelete(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{},
})
assert.NoError(t, err)
Expand All @@ -69,7 +69,7 @@ func TestFakeNetworkDelete(t *testing.T) {

func TestFakeNetworkDeleteFail(t *testing.T) {
fake, err := GetNetworkProvider(&entity.Network{
Type: "fake",
Type: entity.FakeNetworkType,
Fake: entity.FakeNetwork{
IWantFail: true,
},
Expand Down
4 changes: 2 additions & 2 deletions src/networkprovider/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ type NetworkProvider interface {

func GetNetworkProvider(network *entity.Network) (NetworkProvider, error) {
switch network.Type {
case "ovs":
case entity.OVSNetworkType:
return OVSNetworkProvider{network.OVS}, nil
case "fake":
case entity.FakeNetworkType:
return FakeNetworkProvider{network.Fake}, nil
default:
return nil, fmt.Errorf("Unsupported Network Type %s", network.Type)
Expand Down
6 changes: 3 additions & 3 deletions src/networkprovider/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
func TestGetNetworkProvider(t *testing.T) {
testCases := []struct {
cases string
netType string
netType entity.NetworkType
netProviderType interface{}
}{
{"ovs", "ovs", reflect.TypeOf(OVSNetworkProvider{})},
{"fake", "fake", reflect.TypeOf(FakeNetworkProvider{})},
{"ovs", entity.OVSNetworkType, reflect.TypeOf(OVSNetworkProvider{})},
{"fake", entity.FakeNetworkType, reflect.TypeOf(FakeNetworkProvider{})},
}

for _, tc := range testCases {
Expand Down
65 changes: 52 additions & 13 deletions src/networkprovider/ovs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,82 @@ func (ovs OVSNetworkProvider) ValidateBeforeCreating(sp *serviceprovider.Contain
}
}

q := bson.M{"nodeName": network.NodeName, "ovs.bridgeName": ovs.BridgeName}
//Check the bridge name, we can't have the same bridge name in the same node
q := bson.M{}
if network.Clusterwise {
//Only check the bridge name
q = bson.M{"ovs.bridgeName": ovs.BridgeName}
} else {
q = bson.M{"nodeName": network.NodeName, "ovs.bridgeName": ovs.BridgeName}
}

n, err := session.Count(entity.NetworkCollectionName, q)
if n >= 1 {
return fmt.Errorf("The bridge name %s is exist on the node %s\n, please use another bridge name", ovs.BridgeName, network.NodeName)
return fmt.Errorf("The bridge name %s is exist, please check your cluster type and reassign another bridge name", ovs.BridgeName)
} else if err != nil {
return err
}
return nil
}

func (ovs OVSNetworkProvider) CreateNetwork(sp *serviceprovider.Container, network entity.Network) error {
nodeIP, err := sp.KubeCtl.GetNodeExternalIP(network.NodeName)
func createOVSNetwork(nodeIP string, bridgeName string, ports []entity.PhysicalPort) error {
nodeAddr := net.JoinHostPort(nodeIP, networkcontroller.DEFAULT_CONTROLLER_PORT)
nc, err := networkcontroller.New(nodeAddr)
if err != nil {
return err
}

target := net.JoinHostPort(nodeIP, networkcontroller.DEFAULT_CONTROLLER_PORT)
nc, err := networkcontroller.New(target)
return nc.CreateOVSNetwork(bridgeName, ports)
}

func deleteOVSNetwork(nodeIP string, bridgeName string) error {
nodeAddr := net.JoinHostPort(nodeIP, networkcontroller.DEFAULT_CONTROLLER_PORT)
nc, err := networkcontroller.New(nodeAddr)
if err != nil {
return err
}

return nc.CreateOVSNetwork(ovs.BridgeName, ovs.PhysicalPorts)
return nc.DeleteOVSNetwork(bridgeName)
}

func (ovs OVSNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, network entity.Network) error {
func (ovs OVSNetworkProvider) CreateNetwork(sp *serviceprovider.Container, network entity.Network) error {
if network.Clusterwise {
nodes, _ := sp.KubeCtl.GetNodes()
for _, v := range nodes {
nodeIP, err := sp.KubeCtl.GetNodeExternalIP(v.GetName())
if err != nil {
return err
}
if err := createOVSNetwork(nodeIP, network.OVS.BridgeName, network.OVS.PhysicalPorts); err != nil {
return err
}
}
return nil
}
nodeIP, err := sp.KubeCtl.GetNodeExternalIP(network.NodeName)
if err != nil {
return err
}
return createOVSNetwork(nodeIP, network.OVS.BridgeName, network.OVS.PhysicalPorts)
}

func (ovs OVSNetworkProvider) DeleteNetwork(sp *serviceprovider.Container, network entity.Network) error {
if network.Clusterwise {
nodes, _ := sp.KubeCtl.GetNodes()
for _, v := range nodes {
nodeIP, err := sp.KubeCtl.GetNodeExternalIP(v.GetName())
if err != nil {
return err
}
if err := deleteOVSNetwork(nodeIP, ovs.BridgeName); err != nil {
return err
}
}
return nil
}

target := net.JoinHostPort(nodeIP, networkcontroller.DEFAULT_CONTROLLER_PORT)
nc, err := networkcontroller.New(target)
nodeIP, err := sp.KubeCtl.GetNodeExternalIP(network.NodeName)
if err != nil {
return err
}

return nc.DeleteOVSNetwork(ovs.BridgeName)
return deleteOVSNetwork(nodeIP, ovs.BridgeName)
}
Loading