link_types and constants updates

Change-Id: I3fdfb723c51087dd24bc9ea303028d4970a518fb
Signed-off-by: Koren Lev <korenlev@gmail.com>

diff --git a/app/install/db/constants.json b/app/install/db/constants.json
index 0521d69..afd4369 100644 (file)
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -168,86 +168,110 @@
         }\r
     ]\r
 },\r
-{ \r
-    "name" : "link_types", \r
+{\r
+    "name" : "link_types",\r
     "data" : [\r
         {\r
-            "label" : "instance-vnic", \r
-            "value" : "instance-vnic"\r
-        }, \r
-        {\r
-            "label" : "otep-vconnector", \r
-            "value" : "otep-vconnector"\r
-        }, \r
-        {\r
-            "label" : "otep-pnic", \r
-            "value" : "otep-pnic"\r
-        }, \r
-        {\r
-            "label" : "pnic-network", \r
-            "value" : "pnic-network"\r
-        }, \r
-        {\r
-            "label" : "vedge-otep", \r
-            "value" : "vedge-otep"\r
-        }, \r
-        {\r
-            "label" : "vnic-vconnector", \r
-            "value" : "vnic-vconnector"\r
-        }, \r
-        {\r
-            "label" : "vconnector-pnic", \r
-            "value" : "vconnector-pnic"\r
-        }, \r
-        {\r
-            "label" : "vnic-vedge", \r
-            "value" : "vnic-vedge"\r
-        }, \r
-        {\r
-            "label" : "vconnector-vedge", \r
-            "value" : "vconnector-vedge"\r
-        }, \r
-        {\r
-            "label" : "vedge-pnic", \r
-            "value" : "vedge-pnic"\r
-        }, \r
-        {\r
-            "label" : "vservice-vnic", \r
-            "value" : "vservice-vnic"\r
-        }, \r
-        {\r
-            "label" : "pnic-host", \r
-            "value" : "pnic-host"\r
-        }, \r
-        {\r
-            "label" : "host-pnic", \r
-            "value" : "host-pnic"\r
-        }, \r
-        {\r
-            "label" : "host-network", \r
-            "value" : "host-network"\r
-        }, \r
-        {\r
-            "label" : "network-host", \r
-            "value" : "network-host"\r
-        }, \r
-        {\r
-            "label" : "switch_pnic-network", \r
-            "value" : "switch_pnic-network"\r
-        }, \r
-        {\r
-            "label" : "network-switch_pnic", \r
-            "value" : "network-switch_pnic"\r
-        }, \r
-        {\r
-            "label" : "switch_pnic-switch", \r
-            "value" : "switch_pnic-switch"\r
-        }, \r
-        {\r
-            "label" : "switch-switch_pnic", \r
-            "value" : "switch-switch_pnic"\r
+            "value" : "instance-vnic", \r
+            "label" : "instance-vnic"\r
+        }, \r
+       {\r
+            "value" : "vnic-instance", \r
+            "label" : "vnic-instance"\r
+        },\r
+        {\r
+            "value" : "vnic-vconnector", \r
+            "label" : "vnic-vconnector"\r
+        },\r
+       {\r
+            "value" : "vconnector-vnic", \r
+            "label" : "vconnector-vnic"\r
+        },\r
+       {\r
+            "value" : "vconnector-vedge", \r
+            "label" : "vconnector-vedge"\r
+        },\r
+       {\r
+            "value" : "vedge-vconnector", \r
+            "label" : "vedge-vconnector"\r
+        },\r
+       {\r
+            "value" : "vedge-host_pnic", \r
+            "label" : "vedge-host_pnic"\r
+        },\r
+       {\r
+            "value" : "host_pnic-vedge", \r
+            "label" : "host_pnic-vedge"\r
+        },\r
+       {\r
+            "value" : "host_pnic-network", \r
+            "label" : "host_pnic-network"\r
+        },\r
+       {\r
+            "value" : "network-host_pnic", \r
+            "label" : "network-host_pnic"\r
+        },\r
+       {\r
+            "value" : "vedge-otep", \r
+            "label" : "vedge-otep"\r
+        },\r
+       {\r
+            "value" : "otep-vedge", \r
+            "label" : "otep-vedge"\r
+        },\r
+       {\r
+            "value" : "otep-vconnector", \r
+            "label" : "otep-vconnector"\r
+        },\r
+       {\r
+            "value" : "vconnector-otep", \r
+            "label" : "vconnector-otep"\r
+        },\r
+        {\r
+            "value" : "otep-host_pnic", \r
+            "label" : "otep-host_pnic"\r
+        },\r
+       {\r
+            "value" : "host_pnic-otep", \r
+            "label" : "host_pnic-otep"\r
+        },\r
+        {\r
+            "value" : "vconnector-host_pnic", \r
+            "label" : "vconnector-host_pnic"\r
+        },\r
+       {\r
+            "value" : "host_pnic-vconnector", \r
+            "label" : "host_pnic-vconnector"\r
+        },\r
+        {\r
+            "value" : "vnic-vedge", \r
+            "label" : "vnic-vedge"\r
+        },\r
+       {\r
+            "value" : "vedge-vnic", \r
+            "label" : "vedge-vnic"\r
+        },\r
+        {\r
+            "value" : "vservice-vnic", \r
+            "label" : "vservice-vnic"\r
+        },\r
+       {\r
+            "value" : "vnic-vservice", \r
+            "label" : "vnic-vservice"\r
+        },\r
+        {\r
+            "value" : "switch_pnic-host_pnic", \r
+            "label" : "switch_pnic-host_pnic"\r
+        },\r
+        {\r
+            "value" : "host_pnic-switch_pnic",\r
+            "label" : "host_pnic-switch_pnic"\r
+        }, \r
+        {\r
+            "value" : "switch_pnic-switch_pnic", \r
+            "label" : "switch_pnic-switch_pnic"\r
         }\r
-    ]\r
+    ] \r
 },\r
 { \r
     "name" : "monitoring_sides", \r
@@ -325,6 +349,18 @@
         {\r
             "label" : "pnic", \r
             "value" : "pnic"\r
+        },\r
+        {\r
+            "label" : "switch_pnic",\r
+            "value" : "switch_pnic"\r
+        },\r
+        {\r
+            "label" : "host_pnic",\r
+            "value" : "host_pnic"\r
+        },\r
+        {\r
+            "label" : "switch",\r
+            "value" : "switch"\r
         }, \r
         {\r
             "label" : "network", \r
@@ -345,15 +381,7 @@
         {\r
             "label" : "host", \r
             "value" : "host"\r
-        }, \r
-        {\r
-            "label" : "switch_pnic", \r
-            "value" : "switch_pnic"\r
-        }, \r
-        {\r
-            "label" : "switch", \r
-            "value" : "switch"\r
-        }\r
+        } \r
     ]\r
 },\r
 { \r

diff --git a/app/install/db/link_types.json b/app/install/db/link_types.json
index 30a610c..e1b98ec 100644 (file)
--- a/app/install/db/link_types.json
+++ b/app/install/db/link_types.json
@@ -1,184 +1,177 @@
-[\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "instance-vnic", \r
-    "endPointA" : "instance", \r
-    "endPointB" : "vnic", \r
-    "type" : "instance-vnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vnic-vconnector", \r
-    "endPointA" : "vnic", \r
-    "endPointB" : "vconnector", \r
-    "type" : "vnic-vconnector"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vconnector-vedge", \r
-    "endPointA" : "vconnector", \r
-    "endPointB" : "vedge", \r
-    "type" : "vconnector-vedge"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vedge-otep", \r
-    "endPointA" : "vedge", \r
-    "endPointB" : "otep", \r
-    "type" : "vedge-otep"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vconnector-pnic", \r
-    "endPointA" : "vconnector", \r
-    "endPointB" : "pnic", \r
-    "type" : "vconnector-pnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "pnic-network", \r
-    "endPointA" : "pnic", \r
-    "endPointB" : "network", \r
-    "type" : "pnic-network"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "otep-vconnector", \r
-    "endPointA" : "otep", \r
-    "endPointB" : "vconnector", \r
-    "type" : "otep-vconnector"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vnic-vedge", \r
-    "endPointA" : "vnic", \r
-    "endPointB" : "vedge", \r
-    "type" : "vnic-vedge"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "network-pnic", \r
-    "endPointA" : "network", \r
-    "endPointB" : "pnic", \r
-    "type" : "network-pnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vedge-vconnector", \r
-    "endPointA" : "vedge", \r
-    "endPointB" : "vconnector", \r
-    "type" : "vedge-vconnector"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vconnector-vnic", \r
-    "endPointA" : "vconnector", \r
-    "endPointB" : "vnic", \r
-    "type" : "vconnector-vnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vnic-instance", \r
-    "endPointA" : "vnic", \r
-    "endPointB" : "instance", \r
-    "type" : "vnic-instance"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vnic-vservice", \r
-    "endPointA" : "vnic", \r
-    "endPointB" : "vservice", \r
-    "type" : "vnic-vservice"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vservice-vnic", \r
-    "endPointA" : "vservice", \r
-    "endPointB" : "vnic", \r
-    "type" : "vservice-vnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "pnic-vconnector", \r
-    "endPointA" : "pnic", \r
-    "endPointB" : "vconnector", \r
-    "type" : "pnic-vconnector"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vconnector-otep", \r
-    "endPointA" : "vconnector", \r
-    "endPointB" : "otep", \r
-    "type" : "vconnector-otep"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "otep-vedge", \r
-    "endPointA" : "otep", \r
-    "endPointB" : "vedge", \r
-    "type" : "otep-vedge"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "vedge-vnic", \r
-    "endPointA" : "vedge", \r
-    "endPointB" : "vnic", \r
-    "type" : "vedge-vnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "pnic-host", \r
-    "endPointA" : "pnic", \r
-    "endPointB" : "host", \r
-    "type" : "pnic-host"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "host-pnic", \r
-    "endPointA" : "host", \r
-    "endPointB" : "pnic", \r
-    "type" : "host-pnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "host-network", \r
-    "endPointA" : "host", \r
-    "endPointB" : "network", \r
-    "type" : "host-network"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "network-host", \r
-    "endPointA" : "network", \r
-    "endPointB" : "host", \r
-    "type" : "network-host"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "network-switch_pnic", \r
-    "endPointA" : "network", \r
-    "endPointB" : "switch_pnic", \r
-    "type" : "network-switch_pnic"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "switch_pnic-network", \r
-    "endPointA" : "switch_pnic", \r
-    "endPointB" : "network", \r
-    "type" : "switch_pnic-network"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "switch_pnic-switch", \r
-    "endPointA" : "switch_pnic", \r
-    "endPointB" : "switch", \r
-    "type" : "switch_pnic-switch"\r
-},\r
-{ \r
-    "user_id" : "WS7j8oTbWPf3LbNne", \r
-    "description" : "switch-switch_pnic", \r
-    "endPointA" : "switch", \r
-    "endPointB" : "switch_pnic", \r
-    "type" : "switch-switch_pnic"\r
-}\r
-]\r
+[
+{ 
+    "endPointA" : "instance", 
+    "endPointB" : "vnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "instance-vnic", 
+    "description" : "instance-vnic"
+},
+{  
+    "endPointA" : "vnic", 
+    "endPointB" : "instance", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vnic-instance", 
+    "description" : "vnic-instance"
+},
+{ 
+    "endPointA" : "vconnector", 
+    "endPointB" : "vnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vconnector-vnic", 
+    "description" : "vconnector-vnic"
+},
+{  
+    "endPointA" : "vnic", 
+    "endPointB" : "vconnector", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vnic-vconnector", 
+    "description" : "vnic-vconnector"
+},
+{  
+    "endPointA" : "vconnector", 
+    "endPointB" : "vedge", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vconnector-vedge", 
+    "description" : "vconnector-vedge"
+},
+{  
+    "endPointA" : "vedge", 
+    "endPointB" : "vconnector", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vedge-vconnector", 
+    "description" : "vedge-vconnector"
+},
+{  
+    "endPointA" : "vedge", 
+    "endPointB" : "otep", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vedge-otep", 
+    "description" : "vedge-otep"
+},
+{  
+    "endPointA" : "otep", 
+    "endPointB" : "vedge", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "otep-vedge", 
+    "description" : "otep-vedge"
+},
+{  
+    "endPointA" : "otep", 
+    "endPointB" : "vconnector", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "otep-vconnector", 
+    "description" : "otep-vconnector"
+},
+{  
+    "endPointA" : "vconnector", 
+    "endPointB" : "otep", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vconnector-otep", 
+    "description" : "vconnector-otep"
+},
+{  
+    "endPointA" : "vnic", 
+    "endPointB" : "vedge", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vnic-vedge", 
+    "description" : "vnic-vedge"
+},
+{  
+    "endPointA" : "vedge", 
+    "endPointB" : "vnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vedge-vnic", 
+    "description" : "vedge-vnic"
+},
+{  
+    "endPointA" : "vnic", 
+    "endPointB" : "vservice", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vnic-vservice", 
+    "description" : "vnic-vservice"
+},
+{ 
+    "endPointA" : "vservice", 
+    "endPointB" : "vnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vservice-vnic", 
+    "description" : "vservice-vnic"
+},
+{  
+    "endPointA" : "vconnector", 
+    "endPointB" : "host_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vconnector-host_pnic", 
+    "description" : "vconnector-host_pnic"
+},
+{  
+    "endPointA" : "host_pnic", 
+    "endPointB" : "vconnector", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "host_pnic-vconnector", 
+    "description" : "host_pnic-vconnector"
+},
+{  
+    "endPointA" : "host_pnic", 
+    "endPointB" : "network", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "host_pnic-network", 
+    "description" : "host_pnic-network"
+},
+{  
+    "endPointA" : "network", 
+    "endPointB" : "host_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "network-host_pnic", 
+    "description" : "network-host_pnic"
+},
+{  
+    "endPointA" : "host_pnic", 
+    "endPointB" : "vedge", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "host_pnic-vedge", 
+    "description" : "host_pnic-vedge"
+},
+{  
+    "endPointA" : "vedge", 
+    "endPointB" : "host_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "vedge-host_pnic", 
+    "description" : "vedge-host_pnic"
+},
+{  
+    "endPointA" : "host_pnic", 
+    "endPointB" : "otep", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "host_pnic-otep", 
+    "description" : "host_pnic-otep"
+},
+{  
+    "endPointA" : "otep", 
+    "endPointB" : "host_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "otep-host_pnic", 
+    "description" : "otep-host_pnic"
+},
+{  
+    "endPointA" : "switch_pnic", 
+    "endPointB" : "switch_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "switch_pnic-switch_pnic", 
+    "description" : "switch_pnic-switch_pnic"
+},
+{  
+    "endPointA" : "switch_pnic", 
+    "endPointB" : "host_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "switch_pnic-host_pnic", 
+    "description" : "switch_pnic-host_pnic"
+},
+{  
+    "endPointA" : "host_pnic", 
+    "endPointB" : "switch_pnic", 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "type" : "host_pnic-switch_pnic", 
+    "description" : "host_pnic-switch_pnic"
+}
+]