This PR moves cni related code from network package to cni. (Azure#131)

* configure dnssuffix & dnsServerList * add dns info to conflist * change case for dns info * remove hardcoding * remove hardcoding * parse k8s pod info * add AdditionalArgs and Dns info to conflist * serialize policies * program route info * start addressign ipam ip leak * fix 1) ip inconsistency in k8s & pod. 2) IP leak in IPAM. * remove comments * separate windows & linux * remove dnsServers * remove comments * address comments * add dns verification * abstract linux policy struct * remove setPolicies * separte Windows & Linux code * change package * add policy structure to Linux * move policy code to policy.go * fix network_linux func signature * restructure policy pkg

Author: Yongli Chen

cni/network/network_linux.go

@@ -1,10 +1,12 @@
 package network
 
 import (
+"github.com/Azure/azure-container-networking/cni"
+"github.com/Azure/azure-container-networking/network"
 cniTypesCurr "github.com/containernetworking/cni/pkg/types/current"
 )
 
 // handleConsecutiveAdd is a dummy function for Linux platform.
-func handleConsecutiveAdd(containerId, endpointId string, nwInfo *NetworkInfo, nwCfg *NetworkConfig) (*cniTypesCurr.Result, error) {
+func handleConsecutiveAdd(containerId, endpointId string, nwInfo *network.NetworkInfo, nwCfg *cni.NetworkConfig) (*cniTypesCurr.Result, error) {
 return nil, nil
 }

network/policy/policy.go

@@ -0,0 +1,23 @@
+package policy
+
+import (
+"encoding/json"
+)
+
+type CNIPolicyType string
+
+type Policy struct {
+Type CNIPolicyType
+Data json.RawMessage
+}
+
+// SerializePolicies serializes policies to json.
+func SerializePolicies(policyType CNIPolicyType, policies []Policy) []json.RawMessage {
+var jsonPolicies []json.RawMessage
+for _, policy := range policies {
+if policy.Type == policyType {
+jsonPolicies = append(jsonPolicies, policy.Data)
+}
+}
+return jsonPolicies
+}

network/policy/policy_linux.go

@@ -1,29 +1,7 @@
 package policy
 
-import (
-"encoding/json"
-)
-
-type CNIPolicyType string
-
 const (
 NetworkPolicy CNIPolicyType = "NetworkPolicy"
 EndpointPolicy CNIPolicyType = "EndpointPolicy"
 OutBoundNatPolicy CNIPolicyType = "OutBoundNatPolicy"
 )
-
-type Policy struct {
-Type CNIPolicyType
-Data json.RawMessage
-}
-
-// SerializePolicies serializes policies to json.
-func SerializePolicies(policyType CNIPolicyType, policies []Policy) []json.RawMessage {
-var jsonPolicies []json.RawMessage
-for _, policy := range policies {
-if policy.Type == policyType {
-jsonPolicies = append(jsonPolicies, policy.Data)
-}
-}
-return jsonPolicies
-}