Merge pull request #134 from linkernetworks/johnlin/internalIP

use internal IP

Former-commit-id: a35b02ae6e52a83a022b43bad2a4b273f38f83a0 [formerly a35b02ae6e52a83a022b43bad2a4b273f38f83a0 [formerly a14abab]]
Former-commit-id: a92329b5e7479c55ccd41be64e235a5495d74e88
Former-commit-id: a0ed2e9

src/kubernetes/nodes.go

@@ -38,3 +38,19 @@ func (kc *KubeCtl) GetNodeExternalIP(name string) (string, error) {
 	}
 	return nodeIP, nil
 }
+
+//Get the internal IP address of node
+func (kc *KubeCtl) GetNodeInternalIP(name string) (string, error) {
+	node, err := kc.GetNode(name)
+	if err != nil {
+		return "", err
+	}
+	var nodeIP string
+	for _, addr := range node.Status.Addresses {
+		if addr.Type == "InternalIP" {
+			nodeIP = addr.Address
+			break
+		}
+	}
+	return nodeIP, nil
+}

src/kubernetes/nodes_test.go

@@ -104,6 +104,48 @@ func (suite *KubeCtlNodeTestSuite) TestGetInvalidNodeExternalIP() {
 	suite.Equal("", nodeIP)
 }
 
+func (suite *KubeCtlNodeTestSuite) TestGetNodeInternalIP() {
+	nodeAddr := corev1.NodeAddress{
+		Type:    "InternalIP",
+		Address: "10.0.2.200",
+	}
+	node := corev1.Node{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "K8S-Node-6",
+		},
+		Status: corev1.NodeStatus{
+			Addresses: []corev1.NodeAddress{nodeAddr},
+		},
+	}
+	_, err := suite.fakeclient.CoreV1().Nodes().Create(&node)
+	suite.NoError(err)
+
+	nodeIP, err := suite.kubectl.GetNodeInternalIP("K8S-Node-6")
+	suite.NoError(err)
+	suite.Equal(nodeAddr.Address, nodeIP)
+}
+
+func (suite *KubeCtlNodeTestSuite) TestGetInvalidNodeInternalIP() {
+	nodeAddr := corev1.NodeAddress{
+		Type:    "InternalIP",
+		Address: "10.0.2.200",
+	}
+	node := corev1.Node{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "K8S-Node-7",
+		},
+		Status: corev1.NodeStatus{
+			Addresses: []corev1.NodeAddress{nodeAddr},
+		},
+	}
+	_, err := suite.fakeclient.CoreV1().Nodes().Create(&node)
+	suite.NoError(err)
+
+	nodeIP, err := suite.kubectl.GetNodeInternalIP("K8S-Node-99")
+	suite.Error(err)
+	suite.Equal("", nodeIP)
+}
+
 func (suite *KubeCtlNodeTestSuite) TearDownSuite() {}
 
 func TestKubeNodeTestSuite(t *testing.T) {

src/networkcontroller/network_controller_test.go

@@ -50,7 +50,7 @@ func (suite *NetworkControllerTestSuite) SetupSuite() {
 	//Create a fake clinet
 	//Init
 	nodeAddr := corev1.NodeAddress{
-		Type:    "ExternalIP",
+		Type:    "InternalIP",
 		Address: "127.0.0.1",
 	}
 
@@ -118,7 +118,7 @@ func (suite *NetworkControllerTestSuite) TestCreateNetwork() {
 		},
 	}
 
-	nodeIP, err := suite.kubectl.GetNodeExternalIP(suite.nodeName)
+	nodeIP, err := suite.kubectl.GetNodeInternalIP(suite.nodeName)
 	suite.NoError(err)
 	nc, err := New(net.JoinHostPort(nodeIP, DEFAULT_CONTROLLER_PORT))
 	suite.NoError(err)
@@ -150,7 +150,7 @@ func (suite *NetworkControllerTestSuite) TestCreateOVSUserpsaceNetwork() {
 		},
 	}
 
-	nodeIP, err := suite.kubectl.GetNodeExternalIP(suite.nodeName)
+	nodeIP, err := suite.kubectl.GetNodeInternalIP(suite.nodeName)
 	suite.NoError(err)
 	nc, err := New(net.JoinHostPort(nodeIP, DEFAULT_CONTROLLER_PORT))
 	suite.NoError(err)
@@ -181,7 +181,7 @@ func (suite *NetworkControllerTestSuite) TestDeleteNetwork() {
 		},
 	}
 
-	nodeIP, err := suite.kubectl.GetNodeExternalIP(suite.nodeName)
+	nodeIP, err := suite.kubectl.GetNodeInternalIP(suite.nodeName)
 	suite.NoError(err)
 	nc, err := New(net.JoinHostPort(nodeIP, DEFAULT_CONTROLLER_PORT))
 	suite.NoError(err)

src/networkprovider/ovs_netdev.go

@@ -17,7 +17,7 @@ func (unp userspaceNetworkProvider) CreateNetwork(sp *serviceprovider.Container)
 		return err
 	}
 	for _, node := range unp.Nodes {
-		nodeIP, err := sp.KubeCtl.GetNodeExternalIP(node.Name)
+		nodeIP, err := sp.KubeCtl.GetNodeInternalIP(node.Name)
 		if err != nil {
 			return err
 		}
@@ -46,7 +46,7 @@ func (unp userspaceNetworkProvider) CreateNetwork(sp *serviceprovider.Container)
 
 func (unp userspaceNetworkProvider) DeleteNetwork(sp *serviceprovider.Container) error {
 	for _, node := range unp.Nodes {
-		nodeIP, err := sp.KubeCtl.GetNodeExternalIP(node.Name)
+		nodeIP, err := sp.KubeCtl.GetNodeInternalIP(node.Name)
 		if err != nil {
 			return err
 		}

src/networkprovider/ovs_netdev_test.go

@@ -53,7 +53,7 @@ func (suite *OVSNetdevNetworkTestSuite) SetupSuite() {
 		Status: corev1.NodeStatus{
 			Addresses: []corev1.NodeAddress{
 				{
-					Type:    "ExternalIP",
+					Type:    "InternalIP",
 					Address: DPDK_LOCAL_IP,
 				},
 			},
@@ -68,7 +68,7 @@ func (suite *OVSNetdevNetworkTestSuite) SetupSuite() {
 		Status: corev1.NodeStatus{
 			Addresses: []corev1.NodeAddress{
 				{
-					Type:    "ExternalIP",
+					Type:    "InternalIP",
 					Address: DPDK_LOCAL_IP,
 				},
 			},

src/networkprovider/ovs_system.go

@@ -17,7 +17,7 @@ func (knp kernelspaceNetworkProvider) CreateNetwork(sp *serviceprovider.Containe
 		return err
 	}
 	for _, node := range knp.Nodes {
-		nodeIP, err := sp.KubeCtl.GetNodeExternalIP(node.Name)
+		nodeIP, err := sp.KubeCtl.GetNodeInternalIP(node.Name)
 		if err != nil {
 			return err
 		}
@@ -35,7 +35,7 @@ func (knp kernelspaceNetworkProvider) CreateNetwork(sp *serviceprovider.Containe
 
 func (knp kernelspaceNetworkProvider) DeleteNetwork(sp *serviceprovider.Container) error {
 	for _, node := range knp.Nodes {
-		nodeIP, err := sp.KubeCtl.GetNodeExternalIP(node.Name)
+		nodeIP, err := sp.KubeCtl.GetNodeInternalIP(node.Name)
 		if err != nil {
 			return err
 		}

src/networkprovider/ovs_system_test.go

@@ -62,7 +62,7 @@ func (suite *OVSSystemNetworkTestSuite) SetupSuite() {
 		Status: corev1.NodeStatus{
 			Addresses: []corev1.NodeAddress{
 				{
-					Type:    "ExternalIP",
+					Type:    "InternalIP",
 					Address: OVS_LOCAL_IP,
 				},
 			},
@@ -77,7 +77,7 @@ func (suite *OVSSystemNetworkTestSuite) SetupSuite() {
 		Status: corev1.NodeStatus{
 			Addresses: []corev1.NodeAddress{
 				{
-					Type:    "ExternalIP",
+					Type:    "InternalIP",
 					Address: OVS_LOCAL_IP,
 				},
 			},