Merge "Re-organized CNI code to support Kubernetes and Mesos"

Juniper · Feb 1, 2017 · a315246 · a315246
2 parents 0cfe50d + f48c904
commit a315246
Show file tree

Hide file tree

Showing 32 changed files with 1,540 additions and 1,008 deletions.
diff --git a/src/container/cni/SConscript b/src/container/cni/SConscript
@@ -26,20 +26,21 @@ for file in setup_sources:
 local_sources = [
     './cni/__init__.py',
     './cni/common/__init__.py',
-    './cni/common/logger.py',
-    './cni/common/consts.py',
-    './cni/common/vrouter.py',
     './cni/common/cni.py',
-    './cni/common/config.py',
-    './cni/common/params.py',
+    './cni/common/interface.py',
+    './cni/common/macvlan.py',
+    './cni/common/veth.py',
+    './cni/contrail/__init__.py',
+    './cni/contrail/contrail_cni.py',
+    './cni/contrail/vrouter.py',
     './cni/kube-cni/__init__.py',
-    './cni/kube-cni/kube_cni.py',
+    './cni/kube-cni/contrail-kube-cni.py',
     './cni/kube-cni/kube_params.py',
+    './cni/kube-cni/test/__init__.py',
     './cni/mesos-cni/__init__.py',
-    './cni/mesos-cni/mesos_main.py',
-    './cni/mesos-cni/mesos_params.py',
-    './cni/mesos-cni/tests/__init__.py',
-    './cni/tests/__init__.py',
+    './cni/mesos-cni/contrail-mesos-cni.py',
+    './cni/mesos-cni/test/__init__.py',
+    './cni/test/__init__.py',
 ]
 
 local_sources_rules = []