Merge pull request #139 from ligato/pantheon-dev

Pantheon dev

CHANGELOG.md

@@ -1,10 +1,11 @@
-# Release v1.0.5 (2017-9-25)
+# Release v1.0.5 (2017-9-26)
 
 ## Compatibility
-VPP version v17.10-rc0~370-g9969a32
+VPP version v17.10-rc0~334-gce41a5c
 
 ## Major Themes
-
+- [cn-infra]
+    - updated to version 1.0.4
 - [GoVppMux](plugins/govppmux)
     - configuration file for govpp added
 - [Kafka Partitions](messaging/kafka)

glide.yaml

@@ -1,7 +1,7 @@
 package: github.com/ligato/vpp-agent
 import:
 - package: github.com/ligato/cn-infra
-  version: 53de9805afc0d3fbdc6053815cea9454d7918f54
+  version: d80416b19b308869c3395163e4783f63bbc96f2b
 - package: github.com/wadey/gocovmerge
   version: b5bfa59ec0adc420475f97f89b58045c721d761c
 - package: github.com/onsi/gomega

plugins/linuxplugin/linuxcalls/ns_linuxcalls.go

@@ -75,6 +75,8 @@ func CompareNamespaces(ns1 *intf.LinuxInterfaces_Interface_Namespace, ns2 *intf.
 		return strings.Compare(ns1.Microservice, ns2.Microservice)
 	case intf.LinuxInterfaces_Interface_Namespace_NAMED_NS:
 		return strings.Compare(ns1.Name, ns2.Name)
+	case intf.LinuxInterfaces_Interface_Namespace_FILE_REF_NS:
+		return strings.Compare(ns1.Filepath, ns2.Filepath)
 	}
 	return 0
 }
@@ -89,6 +91,8 @@ func NamespaceToStr(namespace *intf.LinuxInterfaces_Interface_Namespace) string
 			return "MICROSERVICE:" + namespace.Microservice
 		case intf.LinuxInterfaces_Interface_Namespace_NAMED_NS:
 			return namespace.Name
+		case intf.LinuxInterfaces_Interface_Namespace_FILE_REF_NS:
+			return "FILE:" + namespace.Filepath
 		}
 	}
 	return "<nil>"
@@ -267,6 +271,14 @@ func GetOrCreateNs(namespace *intf.LinuxInterfaces_Interface_Namespace) (netns.N
 				return netns.None(), errors.New("Failed to get namespace by name")
 			}
 		}
+	case intf.LinuxInterfaces_Interface_Namespace_FILE_REF_NS:
+		if namespace.Filepath == "" {
+			return dupNsHandle(defaultNs)
+		}
+		ns, err = netns.GetFromPath(namespace.Filepath)
+		if err != nil {
+			return netns.None(), err
+		}
 	case intf.LinuxInterfaces_Interface_Namespace_MICROSERVICE_REF_NS:
 		return netns.None(), errors.New("Don't know how to convert microservice label to PID at this level")
 	}

plugins/linuxplugin/model/interfaces/interfaces.proto

@@ -19,17 +19,18 @@ message LinuxInterfaces {
         repeated string ip_addresses = 10;
 
         // Linux network namespace to attach the interface into.
-        // Configure only for Linux interfaces (VETH).
         message Namespace {
             enum NamespaceType {
                 PID_REF_NS = 0; // Attach to namespace of a given process.
                 MICROSERVICE_REF_NS = 1; // Attach to namespace of a docker container running given microservice.
                 NAMED_NS = 2;   // Attach to named namespace.
+                FILE_REF_NS = 3;   // Attach to namespace referenced by a file handle.
             }
             NamespaceType type = 1;
-            uint32 pid = 3;
-            string microservice = 4;
-            string name = 5;
+            uint32 pid = 2;
+            string microservice = 3;
+            string name = 4;
+            string filepath = 5;
         }
         Namespace namespace = 50;
 

scripts/build-vpp.sh

@@ -2,8 +2,8 @@
 set -e
 
 VPP_CACHE_DIR=$HOME/build-cache/vpp
-VPP_COMMIT="9969a3274bfdbaa62b3528887641c5ea36a8509f"
-VPP_IMG_TAG="9969a32"
+VPP_COMMIT="ce41a5c8032ff581a56b990361a2368c879a7adf"
+VPP_IMG_TAG="ce41a5c"
 
 if [ ! -d "$VPP_CACHE_DIR" ]; then
     echo "Building VPP binaries."