link_types and constants updates

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

2 files changed, 291 insertions, 270 deletions

diff --git a/app/install/db/constants.json b/app/install/db/constants.json
index 0521d69..afd4369 100644
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -168,86 +168,110 @@
         }

     ]

 },

-{ 

-    "name" : "link_types", 

+{

+    "name" : "link_types",

     "data" : [

         {

-            "label" : "instance-vnic", 

-            "value" : "instance-vnic"

-        }, 

-        {

-            "label" : "otep-vconnector", 

-            "value" : "otep-vconnector"

-        }, 

-        {

-            "label" : "otep-pnic", 

-            "value" : "otep-pnic"

-        }, 

-        {

-            "label" : "pnic-network", 

-            "value" : "pnic-network"

-        }, 

-        {

-            "label" : "vedge-otep", 

-            "value" : "vedge-otep"

-        }, 

-        {

-            "label" : "vnic-vconnector", 

-            "value" : "vnic-vconnector"

-        }, 

-        {

-            "label" : "vconnector-pnic", 

-            "value" : "vconnector-pnic"

-        }, 

-        {

-            "label" : "vnic-vedge", 

-            "value" : "vnic-vedge"

-        }, 

-        {

-            "label" : "vconnector-vedge", 

-            "value" : "vconnector-vedge"

-        }, 

-        {

-            "label" : "vedge-pnic", 

-            "value" : "vedge-pnic"

-        }, 

-        {

-            "label" : "vservice-vnic", 

-            "value" : "vservice-vnic"

-        }, 

-        {

-            "label" : "pnic-host", 

-            "value" : "pnic-host"

-        }, 

-        {

-            "label" : "host-pnic", 

-            "value" : "host-pnic"

-        }, 

-        {

-            "label" : "host-network", 

-            "value" : "host-network"

-        }, 

-        {

-            "label" : "network-host", 

-            "value" : "network-host"

-        }, 

-        {

-            "label" : "switch_pnic-network", 

-            "value" : "switch_pnic-network"

-        }, 

-        {

-            "label" : "network-switch_pnic", 

-            "value" : "network-switch_pnic"

-        }, 

-        {

-            "label" : "switch_pnic-switch", 

-            "value" : "switch_pnic-switch"

-        }, 

-        {

-            "label" : "switch-switch_pnic", 

-            "value" : "switch-switch_pnic"

+            "value" : "instance-vnic", 

+            "label" : "instance-vnic"

+        }, 

+	{

+            "value" : "vnic-instance", 

+            "label" : "vnic-instance"

+        },

+        {

+            "value" : "vnic-vconnector", 

+            "label" : "vnic-vconnector"

+        },

+	{

+            "value" : "vconnector-vnic", 

+            "label" : "vconnector-vnic"

+        },

+	{

+            "value" : "vconnector-vedge", 

+            "label" : "vconnector-vedge"

+        },

+	{

+            "value" : "vedge-vconnector", 

+            "label" : "vedge-vconnector"

+        },

+	{

+            "value" : "vedge-host_pnic", 

+            "label" : "vedge-host_pnic"

+        },

+	{

+            "value" : "host_pnic-vedge", 

+            "label" : "host_pnic-vedge"

+        },

+	{

+            "value" : "host_pnic-network", 

+            "label" : "host_pnic-network"

+        },

+	{

+            "value" : "network-host_pnic", 

+            "label" : "network-host_pnic"

+        },

+	{

+            "value" : "vedge-otep", 

+            "label" : "vedge-otep"

+        },

+	{

+            "value" : "otep-vedge", 

+            "label" : "otep-vedge"

+        },

+	{

+            "value" : "otep-vconnector", 

+            "label" : "otep-vconnector"

+        },

+	{

+            "value" : "vconnector-otep", 

+            "label" : "vconnector-otep"

+        },

+        {

+            "value" : "otep-host_pnic", 

+            "label" : "otep-host_pnic"

+        },

+	{

+            "value" : "host_pnic-otep", 

+            "label" : "host_pnic-otep"

+        },

+        {

+            "value" : "vconnector-host_pnic", 

+            "label" : "vconnector-host_pnic"

+        },

+	{

+            "value" : "host_pnic-vconnector", 

+            "label" : "host_pnic-vconnector"

+        },

+        {

+            "value" : "vnic-vedge", 

+            "label" : "vnic-vedge"

+        },

+	{

+            "value" : "vedge-vnic", 

+            "label" : "vedge-vnic"

+        },

+        {

+            "value" : "vservice-vnic", 

+            "label" : "vservice-vnic"

+        },

+	{

+            "value" : "vnic-vservice", 

+            "label" : "vnic-vservice"

+        },

+        {

+            "value" : "switch_pnic-host_pnic", 

+            "label" : "switch_pnic-host_pnic"

+        },

+        {

+            "value" : "host_pnic-switch_pnic",

+            "label" : "host_pnic-switch_pnic"

+        }, 

+        {

+            "value" : "switch_pnic-switch_pnic", 

+            "label" : "switch_pnic-switch_pnic"

         }

-    ]

+    ] 

 },

 { 

     "name" : "monitoring_sides", 

@@ -325,6 +349,18 @@
         {

             "label" : "pnic", 

             "value" : "pnic"

+        },

+        {

+            "label" : "switch_pnic",

+            "value" : "switch_pnic"

+        },

+        {

+            "label" : "host_pnic",

+            "value" : "host_pnic"

+        },

+        {

+            "label" : "switch",

+            "value" : "switch"

         }, 

         {

             "label" : "network", 

@@ -345,15 +381,7 @@
         {

             "label" : "host", 

             "value" : "host"

-        }, 

-        {

-            "label" : "switch_pnic", 

-            "value" : "switch_pnic"

-        }, 

-        {

-            "label" : "switch", 

-            "value" : "switch"

-        }

+        } 

     ]

 },

 { 

diff --git a/app/install/db/link_types.json b/app/install/db/link_types.json
index 30a610c..e1b98ec 100644
--- a/app/install/db/link_types.json
+++ b/app/install/db/link_types.json
@@ -1,184 +1,177 @@
-[

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "instance-vnic", 

-    "endPointA" : "instance", 

-    "endPointB" : "vnic", 

-    "type" : "instance-vnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vnic-vconnector", 

-    "endPointA" : "vnic", 

-    "endPointB" : "vconnector", 

-    "type" : "vnic-vconnector"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vconnector-vedge", 

-    "endPointA" : "vconnector", 

-    "endPointB" : "vedge", 

-    "type" : "vconnector-vedge"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vedge-otep", 

-    "endPointA" : "vedge", 

-    "endPointB" : "otep", 

-    "type" : "vedge-otep"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vconnector-pnic", 

-    "endPointA" : "vconnector", 

-    "endPointB" : "pnic", 

-    "type" : "vconnector-pnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "pnic-network", 

-    "endPointA" : "pnic", 

-    "endPointB" : "network", 

-    "type" : "pnic-network"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "otep-vconnector", 

-    "endPointA" : "otep", 

-    "endPointB" : "vconnector", 

-    "type" : "otep-vconnector"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vnic-vedge", 

-    "endPointA" : "vnic", 

-    "endPointB" : "vedge", 

-    "type" : "vnic-vedge"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "network-pnic", 

-    "endPointA" : "network", 

-    "endPointB" : "pnic", 

-    "type" : "network-pnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vedge-vconnector", 

-    "endPointA" : "vedge", 

-    "endPointB" : "vconnector", 

-    "type" : "vedge-vconnector"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vconnector-vnic", 

-    "endPointA" : "vconnector", 

-    "endPointB" : "vnic", 

-    "type" : "vconnector-vnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vnic-instance", 

-    "endPointA" : "vnic", 

-    "endPointB" : "instance", 

-    "type" : "vnic-instance"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vnic-vservice", 

-    "endPointA" : "vnic", 

-    "endPointB" : "vservice", 

-    "type" : "vnic-vservice"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vservice-vnic", 

-    "endPointA" : "vservice", 

-    "endPointB" : "vnic", 

-    "type" : "vservice-vnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "pnic-vconnector", 

-    "endPointA" : "pnic", 

-    "endPointB" : "vconnector", 

-    "type" : "pnic-vconnector"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vconnector-otep", 

-    "endPointA" : "vconnector", 

-    "endPointB" : "otep", 

-    "type" : "vconnector-otep"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "otep-vedge", 

-    "endPointA" : "otep", 

-    "endPointB" : "vedge", 

-    "type" : "otep-vedge"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "vedge-vnic", 

-    "endPointA" : "vedge", 

-    "endPointB" : "vnic", 

-    "type" : "vedge-vnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "pnic-host", 

-    "endPointA" : "pnic", 

-    "endPointB" : "host", 

-    "type" : "pnic-host"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "host-pnic", 

-    "endPointA" : "host", 

-    "endPointB" : "pnic", 

-    "type" : "host-pnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "host-network", 

-    "endPointA" : "host", 

-    "endPointB" : "network", 

-    "type" : "host-network"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "network-host", 

-    "endPointA" : "network", 

-    "endPointB" : "host", 

-    "type" : "network-host"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "network-switch_pnic", 

-    "endPointA" : "network", 

-    "endPointB" : "switch_pnic", 

-    "type" : "network-switch_pnic"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "switch_pnic-network", 

-    "endPointA" : "switch_pnic", 

-    "endPointB" : "network", 

-    "type" : "switch_pnic-network"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "switch_pnic-switch", 

-    "endPointA" : "switch_pnic", 

-    "endPointB" : "switch", 

-    "type" : "switch_pnic-switch"

-},

-{ 

-    "user_id" : "WS7j8oTbWPf3LbNne", 

-    "description" : "switch-switch_pnic", 

-    "endPointA" : "switch", 

-    "endPointB" : "switch_pnic", 

-    "type" : "switch-switch_pnic"

-}

-]

+[
+{ 
+    "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"
+}
+]