From 3b83dc27808b45371fec7a7ccb701fd683c1e12e Mon Sep 17 00:00:00 2001 From: hwchiu Date: Wed, 18 Jul 2018 07:33:31 +0000 Subject: [PATCH] Rename and fix typo --- src/entity/pod.go | 4 ++-- src/pod/pod.go | 6 +++--- src/pod/pod_test.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/entity/pod.go b/src/entity/pod.go index 3539dc20..17d55b3d 100644 --- a/src/entity/pod.go +++ b/src/entity/pod.go @@ -18,8 +18,8 @@ type Container struct { type PodNetwork struct { Name string `bson:"name" json:"name"` - IFName string `bson:"ifName" json:"ifName"` - VLAN int `bson:"vlan" json:"vlan"` + IfName string `bson:"ifName" json:"ifName"` + VlanTag int `bson:"vlanTag" json:"vlanTag"` IPAddress string `bson:"ipAddress json:"ipAddress"` Netmask string `bson:"netmask" json:"netmask"` BridgeName string `bson:"bridgeName" json:"bridgeName"` //its from the entity.Network entity diff --git a/src/pod/pod.go b/src/pod/pod.go index e0f6add2..d6702077 100644 --- a/src/pod/pod.go +++ b/src/pod/pod.go @@ -112,7 +112,7 @@ func generateClientCommand(network entity.PodNetwork) []string { return []string{ "-s=unix:///tmp/vortex.sock", "-b=" + network.BridgeName, - "-n=" + network.IFName, + "-n=" + network.IfName, "-i=" + ip, } } @@ -123,7 +123,7 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er for i, v := range networks { containers = append(containers, corev1.Container{ Name: fmt.Sprintf("init-network-client-%d", i), - Image: "sdnvortex/network-controller:latest", + Image: "sdnvortex/network-controller:v0.2.1", Command: []string{"/go/bin/client"}, Args: generateClientCommand(v), Env: []corev1.EnvVar{ @@ -164,7 +164,7 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er return containers, nil } -//For the network, we will generate two thins +//For the network, we will generate two things //[]string => a list of nodes and it will apply on nodeaffinity //[]corev1.Container => a list of init container we will apply on pod func generateNetwork(pod *entity.Pod, session *mongo.Session) ([]string, []corev1.Container, error) { diff --git a/src/pod/pod_test.go b/src/pod/pod_test.go index 1449992b..2bddd4c8 100644 --- a/src/pod/pod_test.go +++ b/src/pod/pod_test.go @@ -268,7 +268,7 @@ func (suite *PodTestSuite) TestGenerateClientCommand() { bName := namesgenerator.GetRandomName(0) ifName := namesgenerator.GetRandomName(0) podNetwork := entity.PodNetwork{ - IFName: ifName, + IfName: ifName, IPAddress: "1.2.3.4", Netmask: "255.255.255.0", BridgeName: bName, @@ -300,7 +300,7 @@ func (suite *PodTestSuite) TestGenerateNetwork() { Networks: []entity.PodNetwork{ { Name: networkName, - IFName: ifName, + IfName: ifName, IPAddress: "1.2.3.4", Netmask: "255.255.255.0", }, @@ -323,7 +323,7 @@ func (suite *PodTestSuite) TestGenerateNetworkFail() { Networks: []entity.PodNetwork{ { Name: networkName, - IFName: ifName, + IfName: ifName, IPAddress: "1.2.3.4", Netmask: "255.255.255.0", },