From 9d51c29acfb81ae16c72a1675d7b021d032dbdfb Mon Sep 17 00:00:00 2001
From: yayogev <yaronyogev@gmail.com>
Date: Fri, 11 Aug 2017 00:35:14 +0300
Subject: US2853 rename pnic to host_pnic & switch_pnic

fixed clique finder to work with switch-switch link type

Change-Id: I4f815f77e6b4ea36669dfb58bb5f5e914fe3e1ac
Signed-off-by: yayogev <yaronyogev@gmail.com>
---
 app/install/db/attributes_for_hover_on_data.json |  178 +--
 app/install/db/clique_types.json                 |  112 +-
 app/install/db/constants.json                    | 1368 +++++++++++-----------
 app/install/db/link_types.json                   |  233 ++--
 4 files changed, 933 insertions(+), 958 deletions(-)

(limited to 'app/install/db')

diff --git a/app/install/db/attributes_for_hover_on_data.json b/app/install/db/attributes_for_hover_on_data.json
index 6fdc5a3..c2ba051 100644
--- a/app/install/db/attributes_for_hover_on_data.json
+++ b/app/install/db/attributes_for_hover_on_data.json
@@ -1,89 +1,89 @@
-[
-{ 
-    "attributes" : [
-        "object_name", 
-        "model", 
-        "mac_address", 
-        "type", 
-        "koren"
-    ], 
-    "type" : "vnic"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "connector_type", 
-        "type", 
-        "interfaces"
-    ], 
-    "type" : "vconnector"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "host", 
-        "service_type", 
-        "type"
-    ], 
-    "type" : "vservice"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "host", 
-        "agent_type", 
-        "binary", 
-        "type"
-    ], 
-    "type" : "vedge"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "host", 
-        "mac_address", 
-        "Speed", 
-        "Link detected", 
-        "type"
-    ], 
-    "type" : "pnic"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "provider:segmentation_id", 
-        "provider:network_type", 
-        "type"
-    ], 
-    "type" : "network"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "host_type", 
-        "parent_id", 
-        "type"
-    ], 
-    "type" : "host"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "host", 
-        "project", 
-        "type", 
-        "name_path"
-    ], 
-    "type" : "instance"
-},
-{ 
-    "attributes" : [
-        "object_name", 
-        "overlay_type", 
-        "ip_address", 
-        "type", 
-        "ports"
-    ], 
-    "type" : "otep"
-}
-]
+[
+{ 
+    "attributes" : [
+        "object_name", 
+        "model", 
+        "mac_address", 
+        "type", 
+        "koren"
+    ], 
+    "type" : "vnic"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "connector_type", 
+        "type", 
+        "interfaces"
+    ], 
+    "type" : "vconnector"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "host", 
+        "service_type", 
+        "type"
+    ], 
+    "type" : "vservice"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "host", 
+        "agent_type", 
+        "binary", 
+        "type"
+    ], 
+    "type" : "vedge"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "host", 
+        "mac_address", 
+        "Speed", 
+        "Link detected", 
+        "type"
+    ], 
+    "type" : "host_pnic"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "provider:segmentation_id", 
+        "provider:network_type", 
+        "type"
+    ], 
+    "type" : "network"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "host_type", 
+        "parent_id", 
+        "type"
+    ], 
+    "type" : "host"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "host", 
+        "project", 
+        "type", 
+        "name_path"
+    ], 
+    "type" : "instance"
+},
+{ 
+    "attributes" : [
+        "object_name", 
+        "overlay_type", 
+        "ip_address", 
+        "type", 
+        "ports"
+    ], 
+    "type" : "otep"
+}
+]
diff --git a/app/install/db/clique_types.json b/app/install/db/clique_types.json
index a2ef3c2..575d083 100644
--- a/app/install/db/clique_types.json
+++ b/app/install/db/clique_types.json
@@ -1,56 +1,56 @@
-[
-{ 
-    "environment" : "ANY", 
-    "focal_point_type" : "instance", 
-    "link_types" : [
-        "instance-vnic", 
-        "vnic-vconnector", 
-        "vconnector-vedge", 
-        "vedge-otep", 
-        "otep-vconnector", 
-        "vconnector-pnic", 
-        "pnic-network"
-    ], 
-    "name" : "instance"
-},
-{  
-    "environment" : "ANY", 
-    "focal_point_type" : "pnic", 
-    "link_types" : [
-        "pnic-host", 
-        "host-network", 
-        "network-switch_pnic", 
-        "switch_pnic-switch"
-    ], 
-    "name" : "pnic_clique"
-},
-{ 
-    "environment" : "ANY", 
-    "focal_point_type" : "vservice", 
-    "link_types" : [
-        "vservice-vnic", 
-        "vnic-vedge", 
-        "vedge-otep", 
-        "otep-vconnector", 
-        "vconnector-pnic", 
-        "pnic-network"
-    ], 
-    "name" : "vservice"
-},
-{ 
-    "environment" : "ANY", 
-    "focal_point_type" : "network", 
-    "link_types" : [
-        "network-pnic", 
-        "pnic-vconnector", 
-        "vconnector-otep", 
-        "otep-vedge", 
-        "vedge-vconnector", 
-        "vedge-vnic", 
-        "vconnector-vnic", 
-        "vnic-instance", 
-        "vnic-vservice"
-    ], 
-    "name" : "network"
-}
-]
+[
+{ 
+    "environment" : "ANY", 
+    "focal_point_type" : "instance", 
+    "link_types" : [
+        "instance-vnic", 
+        "vnic-vconnector", 
+        "vconnector-vedge", 
+        "vedge-otep", 
+        "otep-vconnector", 
+        "vconnector-host_pnic", 
+        "host_pnic-network"
+    ], 
+    "name" : "instance"
+},
+{  
+    "environment" : "ANY", 
+    "focal_point_type" : "host_pnic",
+    "link_types" : [
+        "host_pnic-host", 
+        "host-network", 
+        "network-switch_pnic", 
+        "switch_pnic-switch"
+    ], 
+    "name" : "pnic_clique"
+},
+{ 
+    "environment" : "ANY", 
+    "focal_point_type" : "vservice", 
+    "link_types" : [
+        "vservice-vnic", 
+        "vnic-vedge", 
+        "vedge-otep", 
+        "otep-vconnector", 
+        "vconnector-host_pnic", 
+        "host_pnic-network"
+    ], 
+    "name" : "vservice"
+},
+{ 
+    "environment" : "ANY", 
+    "focal_point_type" : "network", 
+    "link_types" : [
+        "network-host_pnic", 
+        "host_pnic-vconnector", 
+        "vconnector-otep", 
+        "otep-vedge", 
+        "vedge-vconnector", 
+        "vedge-vnic", 
+        "vconnector-vnic", 
+        "vnic-instance", 
+        "vnic-vservice"
+    ], 
+    "name" : "network"
+}
+]
diff --git a/app/install/db/constants.json b/app/install/db/constants.json
index c3d59a4..a30ffa9 100644
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -1,700 +1,668 @@
-[
-{ 
-    "data" : [
-        {
-            "label" : "network", 
-            "value" : "network"
-        }
-    ], 
-    "name" : "constraints"
-},
-{ 
-    "data" : [
-        {
-            "label" : "Development", 
-            "value" : "development"
-        }, 
-        {
-            "label" : "Testing", 
-            "value" : "testing"
-        }, 
-        {
-            "label" : "Staging", 
-            "value" : "staging"
-        }, 
-        {
-            "label" : "Production", 
-            "value" : "production"
-        }
-    ], 
-    "name" : "env_types"
-},
-{ 
-    "data" : [
-        {
-            "label" : "CRITICAL", 
-            "value" : "critical"
-        }, 
-        {
-            "label" : "ERROR", 
-            "value" : "error"
-        }, 
-        {
-            "label" : "WARNING", 
-            "value" : "warning"
-        }, 
-        {
-            "label" : "INFO", 
-            "value" : "info"
-        }, 
-        {
-            "label" : "DEBUG", 
-            "value" : "debug"
-        }, 
-        {
-            "label" : "NOTSET", 
-            "value" : "notset"
-        }
-    ], 
-    "name" : "log_levels"
-},
-{ 
-    "data" : [
-        {
-            "label" : "OVS", 
-            "value" : "OVS"
-        }, 
-        {
-            "label" : "VPP", 
-            "value" : "VPP"
-        }, 
-        {
-            "label" : "LXB", 
-            "value" : "LXB"
-        }, 
-        {
-            "label" : "Arista", 
-            "value" : "Arista"
-        }, 
-        {
-            "label" : "Nexus", 
-            "value" : "Nexus"
-        }
-    ], 
-    "name" : "mechanism_drivers"
-},
-{ 
-    "data" : [
-        {
-            "label" : "local", 
-            "value" : "local"
-        }, 
-        {
-            "label" : "vlan", 
-            "value" : "vlan"
-        }, 
-        {
-            "label" : "vxlan", 
-            "value" : "vxlan"
-        }, 
-        {
-            "label" : "gre", 
-            "value" : "gre"
-        }, 
-        {
-            "label" : "flat", 
-            "value" : "flat"
-        }
-    ], 
-    "name" : "type_drivers"
-},
-{ 
-    "data" : [
-        {
-            "label" : "Sensu", 
-            "value" : "Sensu"
-        }
-    ], 
-    "name" : "environment_monitoring_types"
-},
-{ 
-    "data" : [
-        {
-            "label" : "up", 
-            "value" : "up"
-        }, 
-        {
-            "label" : "down", 
-            "value" : "down"
-        }
-    ], 
-    "name" : "link_states"
-},
-{ 
-    "name" : "environment_provision_types", 
-    "data" : [
-        {
-            "label" : "None", 
-            "value" : "None"
-        }, 
-        {
-            "label" : "Deploy", 
-            "value" : "Deploy"
-        }, 
-        {
-            "label" : "Files", 
-            "value" : "Files"
-        }, 
-        {
-            "label" : "DB", 
-            "value" : "DB"
-        }
-    ]
-},
-{ 
-    "name" : "environment_operational_status", 
-    "data" : [
-        {
-            "value" : "stopped", 
-            "label" : "stopped"
-        }, 
-        {
-            "value" : "running", 
-            "label" : "running"
-        }, 
-        {
-            "value" : "error", 
-            "label" : "error"
-        }
-    ]
-},
-{
-    "name" : "link_types",
-    "data" : [
-        {
-            "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", 
-    "data" : [
-        {
-            "label" : "client", 
-            "value" : "client"
-        }, 
-        {
-            "label" : "server", 
-            "value" : "server"
-        }
-    ]
-},
-{ 
-    "name" : "messages_severity", 
-    "data" : [
-        {
-            "label" : "panic", 
-            "value" : "panic"
-        }, 
-        {
-            "label" : "alert", 
-            "value" : "alert"
-        }, 
-        {
-            "label" : "crit", 
-            "value" : "crit"
-        }, 
-        {
-            "label" : "error", 
-            "value" : "error"
-        }, 
-        {
-            "label" : "warn", 
-            "value" : "warn"
-        }, 
-        {
-            "label" : "notice", 
-            "value" : "notice"
-        }, 
-        {
-            "label" : "info", 
-            "value" : "info"
-        }, 
-        {
-            "label" : "debug", 
-            "value" : "debug"
-        }
-    ]
-},
-{ 
-    "name" : "object_types", 
-    "data" : [
-        {
-            "label" : "vnic", 
-            "value" : "vnic"
-        }, 
-        {
-            "label" : "vconnector", 
-            "value" : "vconnector"
-        }, 
-        {
-            "label" : "vedge", 
-            "value" : "vedge"
-        }, 
-        {
-            "label" : "instance", 
-            "value" : "instance"
-        }, 
-        {
-            "label" : "vservice", 
-            "value" : "vservice"
-        }, 
-        {
-            "label" : "pnic", 
-            "value" : "pnic"
-        },
-        {
-            "label" : "switch_pnic",
-            "value" : "switch_pnic"
-        },
-        {
-            "label" : "host_pnic",
-            "value" : "host_pnic"
-        },
-        {
-            "label" : "switch",
-            "value" : "switch"
-        }, 
-        {
-            "label" : "network", 
-            "value" : "network"
-        }, 
-        {
-            "label" : "port", 
-            "value" : "port"
-        }, 
-        {
-            "label" : "otep", 
-            "value" : "otep"
-        }, 
-        {
-            "label" : "agent", 
-            "value" : "agent"
-        }, 
-        {
-            "label" : "host", 
-            "value" : "host"
-        } 
-    ]
-},
-{ 
-    "name" : "scans_statuses", 
-    "data" : [
-        {
-            "value" : "draft", 
-            "label" : "Draft"
-        }, 
-        {
-            "value" : "pending", 
-            "label" : "Pending"
-        }, 
-        {
-            "value" : "running", 
-            "label" : "Running"
-        }, 
-        {
-            "value" : "completed", 
-            "label" : "Completed"
-        }, 
-        {
-            "value" : "failed", 
-            "label" : "Failed"
-        }, 
-        {
-            "value" : "aborted", 
-            "label" : "Aborted"
-        }
-    ]
-},
-{ 
-    "data" : [
-        {
-            "label" : "Mirantis-6.0", 
-            "value" : "Mirantis-6.0"
-        }, 
-        {
-            "label" : "Mirantis-7.0", 
-            "value" : "Mirantis-7.0"
-        }, 
-        {
-            "label" : "Mirantis-8.0", 
-            "value" : "Mirantis-8.0"
-        }, 
-        {
-            "label" : "Mirantis-9.0", 
-            "value" : "Mirantis-9.0"
-        }, 
-        {
-            "label" : "RDO-Mitaka", 
-            "value" : "RDO-Mitaka"
-        }, 
-        {
-            "label" : "RDO-Liberty", 
-            "value" : "RDO-Liberty"
-        }, 
-        {
-            "label" : "RDO-Juno", 
-            "value" : "RDO-Juno"
-        }, 
-        {
-            "label" : "RDO-kilo", 
-            "value" : "RDO-kilo"
-        }, 
-        {
-            "label" : "devstack-liberty", 
-            "value" : "devstack-liberty"
-        }, 
-        {
-            "label" : "Canonical-icehouse", 
-            "value" : "Canonical-icehouse"
-        }, 
-        {
-            "label" : "Canonical-juno", 
-            "value" : "Canonical-juno"
-        }, 
-        {
-            "label" : "Canonical-liberty", 
-            "value" : "Canonical-liberty"
-        }, 
-        {
-            "label" : "Canonical-mitaka", 
-            "value" : "Canonical-mitaka"
-        }, 
-        {
-            "label" : "Apex-Mitaka", 
-            "value" : "Apex-Mitaka"
-        }, 
-        {
-            "label" : "Devstack-Mitaka", 
-            "value" : "Devstack-Mitaka"
-        }, 
-        {
-            "label" : "packstack-7.0.0-0.10.dev1682", 
-            "value" : "packstack-7.0.0-0.10.dev1682"
-        }, 
-        {
-            "label" : "Stratoscale-v2.1.6", 
-            "value" : "Stratoscale-v2.1.6"
-        }, 
-        {
-            "label" : "Mirantis-9.1", 
-            "value" : "Mirantis-9.1"
-        }
-    ], 
-    "name" : "distributions"
-},
-{  
-    "name" : "message_source_systems", 
-    "data" : [
-        {
-            "value" : "OpenStack", 
-            "label" : "OpenStack"
-        }, 
-        {
-            "value" : "Calipso", 
-            "label" : "Calipso"
-        }, 
-        {
-            "value" : "Sensu", 
-            "label" : "Sensu"
-        }
-    ]
-},
-{ 
-    "name" : "object_types_for_links",
-    "data" : [
-        {
-            "label" : "vnic", 
-            "value" : "vnic"
-        }, 
-        {
-            "label" : "vconnector", 
-            "value" : "vconnector"
-        }, 
-        {
-            "label" : "vedge", 
-            "value" : "vedge"
-        }, 
-        {
-            "label" : "instance", 
-            "value" : "instance"
-        }, 
-        {
-            "label" : "vservice", 
-            "value" : "vservice"
-        }, 
-        {
-            "label" : "pnic", 
-            "value" : "pnic"
-        }, 
-        {
-            "label" : "switch_pnic", 
-            "value" : "switch_pnic"
-        }, 
-        {
-            "label" : "host_pnic", 
-            "value" : "host_pnic"
-        }, 
-        {
-            "label" : "switch", 
-            "value" : "switch"
-        }, 
-        {
-            "label" : "network", 
-            "value" : "network"
-        }, 
-        {
-            "label" : "port", 
-            "value" : "port"
-        }, 
-        {
-            "label" : "otep", 
-            "value" : "otep"
-        }, 
-        {
-            "label" : "agent", 
-            "value" : "agent"
-        }, 
-        {
-            "label" : "host", 
-            "value" : "host"
-        }
-    ] 
-},
-{ 
-    "name" : "scan_object_types", 
-    "data" : [
-        {
-            "label" : "vnic", 
-            "value" : "vnic"
-        }, 
-        {
-            "label" : "vconnector", 
-            "value" : "vconnector"
-        }, 
-        {
-            "label" : "vedge", 
-            "value" : "vedge"
-        }, 
-        {
-            "label" : "instance", 
-            "value" : "instance"
-        }, 
-        {
-            "label" : "vservice", 
-            "value" : "vservice"
-        }, 
-        {
-            "label" : "pnic", 
-            "value" : "pnic"
-        }, 
-        {
-            "label" : "network", 
-            "value" : "network"
-        }, 
-        {
-            "label" : "port", 
-            "value" : "port"
-        }, 
-        {
-            "label" : "otep", 
-            "value" : "otep"
-        }, 
-        {
-            "label" : "agent", 
-            "value" : "agent"
-        }, 
-        {
-            "value" : "availability_zone", 
-            "label" : "availability_zone"
-        }, 
-        {
-            "value" : "regions_folder", 
-            "label" : "regions_folder"
-        }, 
-        {
-            "value" : "instances_folder", 
-            "label" : "instances_folder"
-        }, 
-        {
-            "value" : "pnics_folder", 
-            "label" : "pnics_folder"
-        }, 
-        {
-            "value" : "vconnectors_folder", 
-            "label" : "vconnectors_folder"
-        }, 
-        {
-            "value" : "vedges_folder", 
-            "label" : "vedges_folder"
-        }, 
-        {
-            "value" : "ports_folder", 
-            "label" : "ports_folder"
-        }, 
-        {
-            "value" : "aggregates_folder", 
-            "label" : "aggregates_folder"
-        }, 
-        {
-            "value" : "vservices_folder", 
-            "label" : "vservices_folder"
-        }, 
-        {
-            "value" : "vnics_folder", 
-            "label" : "vnics_folder"
-        }, 
-        {
-            "value" : "network_agent", 
-            "label" : "network_agent"
-        }, 
-        {
-            "value" : "project", 
-            "label" : "project"
-        }, 
-        {
-            "value" : "projects_folder", 
-            "label" : "projects_folder"
-        }, 
-        {
-            "value" : "aggregate", 
-            "label" : "aggregate"
-        }, 
-        {
-            "value" : "network_agents_folder", 
-            "label" : "network_agents_folder"
-        }, 
-        {
-            "value" : "host", 
-            "label" : "host"
-        }, 
-        {
-            "value" : "region", 
-            "label" : "region"
-        }, 
-        {
-            "value" : "host_ref", 
-            "label" : "host_ref"
-        }, 
-        {
-            "value" : "network_services_folder", 
-            "label" : "network_services_folder"
-        }, 
-        {
-            "label" : "switch_pnic", 
-            "value" : "switch_pnic"
-        }, 
-        {
-            "label" : "switch", 
-            "value" : "switch"
-        }
-    ]
-}
-]
+[
+{ 
+    "data" : [
+        {
+            "label" : "network", 
+            "value" : "network"
+        }
+    ], 
+    "name" : "constraints"
+},
+{ 
+    "data" : [
+        {
+            "label" : "Development", 
+            "value" : "development"
+        }, 
+        {
+            "label" : "Testing", 
+            "value" : "testing"
+        }, 
+        {
+            "label" : "Staging", 
+            "value" : "staging"
+        }, 
+        {
+            "label" : "Production", 
+            "value" : "production"
+        }
+    ], 
+    "name" : "env_types"
+},
+{ 
+    "data" : [
+        {
+            "label" : "CRITICAL", 
+            "value" : "critical"
+        }, 
+        {
+            "label" : "ERROR", 
+            "value" : "error"
+        }, 
+        {
+            "label" : "WARNING", 
+            "value" : "warning"
+        }, 
+        {
+            "label" : "INFO", 
+            "value" : "info"
+        }, 
+        {
+            "label" : "DEBUG", 
+            "value" : "debug"
+        }, 
+        {
+            "label" : "NOTSET", 
+            "value" : "notset"
+        }
+    ], 
+    "name" : "log_levels"
+},
+{ 
+    "data" : [
+        {
+            "label" : "OVS", 
+            "value" : "OVS"
+        }, 
+        {
+            "label" : "VPP", 
+            "value" : "VPP"
+        }, 
+        {
+            "label" : "LXB", 
+            "value" : "LXB"
+        }, 
+        {
+            "label" : "Arista", 
+            "value" : "Arista"
+        }, 
+        {
+            "label" : "Nexus", 
+            "value" : "Nexus"
+        }
+    ], 
+    "name" : "mechanism_drivers"
+},
+{ 
+    "data" : [
+        {
+            "label" : "local", 
+            "value" : "local"
+        }, 
+        {
+            "label" : "vlan", 
+            "value" : "vlan"
+        }, 
+        {
+            "label" : "vxlan", 
+            "value" : "vxlan"
+        }, 
+        {
+            "label" : "gre", 
+            "value" : "gre"
+        }, 
+        {
+            "label" : "flat", 
+            "value" : "flat"
+        }
+    ], 
+    "name" : "type_drivers"
+},
+{ 
+    "data" : [
+        {
+            "label" : "Sensu", 
+            "value" : "Sensu"
+        }
+    ], 
+    "name" : "environment_monitoring_types"
+},
+{ 
+    "data" : [
+        {
+            "label" : "up", 
+            "value" : "up"
+        }, 
+        {
+            "label" : "down", 
+            "value" : "down"
+        }
+    ], 
+    "name" : "link_states"
+},
+{ 
+    "name" : "environment_provision_types", 
+    "data" : [
+        {
+            "label" : "None", 
+            "value" : "None"
+        }, 
+        {
+            "label" : "Deploy", 
+            "value" : "Deploy"
+        }, 
+        {
+            "label" : "Files", 
+            "value" : "Files"
+        }, 
+        {
+            "label" : "DB", 
+            "value" : "DB"
+        }
+    ]
+},
+{ 
+    "name" : "environment_operational_status", 
+    "data" : [
+        {
+            "value" : "stopped", 
+            "label" : "stopped"
+        }, 
+        {
+            "value" : "running", 
+            "label" : "running"
+        }, 
+        {
+            "value" : "error", 
+            "label" : "error"
+        }
+    ]
+},
+{ 
+    "name" : "link_types", 
+    "data" : [
+        {
+            "label" : "instance-vnic", 
+            "value" : "instance-vnic"
+        }, 
+        {
+            "label" : "otep-vconnector", 
+            "value" : "otep-vconnector"
+        }, 
+        {
+            "label" : "otep-host_pnic", 
+            "value" : "otep-host_pnic"
+        }, 
+        {
+            "label" : "host_pnic-network", 
+            "value" : "host_pnic-network"
+        }, 
+        {
+            "label" : "vedge-otep", 
+            "value" : "vedge-otep"
+        }, 
+        {
+            "label" : "vnic-vconnector", 
+            "value" : "vnic-vconnector"
+        }, 
+        {
+            "label" : "vconnector-host_pnic", 
+            "value" : "vconnector-host_pnic"
+        }, 
+        {
+            "label" : "vnic-vedge", 
+            "value" : "vnic-vedge"
+        }, 
+        {
+            "label" : "vconnector-vedge", 
+            "value" : "vconnector-vedge"
+        }, 
+        {
+            "label" : "vedge-host_pnic", 
+            "value" : "vedge-host_pnic"
+        }, 
+        {
+            "label" : "vservice-vnic", 
+            "value" : "vservice-vnic"
+        }, 
+        {
+            "label" : "host_pnic-host", 
+            "value" : "host_pnic-host"
+        }, 
+        {
+            "label" : "host-host_pnic", 
+            "value" : "host-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"
+        }
+    ]
+},
+{ 
+    "name" : "monitoring_sides", 
+    "data" : [
+        {
+            "label" : "client", 
+            "value" : "client"
+        }, 
+        {
+            "label" : "server", 
+            "value" : "server"
+        }
+    ]
+},
+{ 
+    "name" : "messages_severity", 
+    "data" : [
+        {
+            "label" : "panic", 
+            "value" : "panic"
+        }, 
+        {
+            "label" : "alert", 
+            "value" : "alert"
+        }, 
+        {
+            "label" : "crit", 
+            "value" : "crit"
+        }, 
+        {
+            "label" : "error", 
+            "value" : "error"
+        }, 
+        {
+            "label" : "warn", 
+            "value" : "warn"
+        }, 
+        {
+            "label" : "notice", 
+            "value" : "notice"
+        }, 
+        {
+            "label" : "info", 
+            "value" : "info"
+        }, 
+        {
+            "label" : "debug", 
+            "value" : "debug"
+        }
+    ]
+},
+{ 
+    "name" : "object_types", 
+    "data" : [
+        {
+            "label" : "vnic", 
+            "value" : "vnic"
+        }, 
+        {
+            "label" : "vconnector", 
+            "value" : "vconnector"
+        }, 
+        {
+            "label" : "vedge", 
+            "value" : "vedge"
+        }, 
+        {
+            "label" : "instance", 
+            "value" : "instance"
+        }, 
+        {
+            "label" : "vservice", 
+            "value" : "vservice"
+        },
+        {
+            "label" : "host_pnic",
+            "value" : "host_pnic"
+        },
+        {
+            "label" : "network", 
+            "value" : "network"
+        }, 
+        {
+            "label" : "port", 
+            "value" : "port"
+        }, 
+        {
+            "label" : "otep", 
+            "value" : "otep"
+        }, 
+        {
+            "label" : "agent", 
+            "value" : "agent"
+        }, 
+        {
+            "label" : "host", 
+            "value" : "host"
+        }, 
+        {
+            "label" : "switch_pnic", 
+            "value" : "switch_pnic"
+        }, 
+        {
+            "label" : "switch", 
+            "value" : "switch"
+        }
+    ]
+},
+{ 
+    "name" : "scans_statuses", 
+    "data" : [
+        {
+            "value" : "draft", 
+            "label" : "Draft"
+        }, 
+        {
+            "value" : "pending", 
+            "label" : "Pending"
+        }, 
+        {
+            "value" : "running", 
+            "label" : "Running"
+        }, 
+        {
+            "value" : "completed", 
+            "label" : "Completed"
+        }, 
+        {
+            "value" : "failed", 
+            "label" : "Failed"
+        }, 
+        {
+            "value" : "aborted", 
+            "label" : "Aborted"
+        }
+    ]
+},
+{ 
+    "data" : [
+        {
+            "label" : "Mirantis-6.0", 
+            "value" : "Mirantis-6.0"
+        }, 
+        {
+            "label" : "Mirantis-7.0", 
+            "value" : "Mirantis-7.0"
+        }, 
+        {
+            "label" : "Mirantis-8.0", 
+            "value" : "Mirantis-8.0"
+        }, 
+        {
+            "label" : "Mirantis-9.0", 
+            "value" : "Mirantis-9.0"
+        }, 
+        {
+            "label" : "RDO-Mitaka", 
+            "value" : "RDO-Mitaka"
+        }, 
+        {
+            "label" : "RDO-Liberty", 
+            "value" : "RDO-Liberty"
+        }, 
+        {
+            "label" : "RDO-Juno", 
+            "value" : "RDO-Juno"
+        }, 
+        {
+            "label" : "RDO-kilo", 
+            "value" : "RDO-kilo"
+        }, 
+        {
+            "label" : "devstack-liberty", 
+            "value" : "devstack-liberty"
+        }, 
+        {
+            "label" : "Canonical-icehouse", 
+            "value" : "Canonical-icehouse"
+        }, 
+        {
+            "label" : "Canonical-juno", 
+            "value" : "Canonical-juno"
+        }, 
+        {
+            "label" : "Canonical-liberty", 
+            "value" : "Canonical-liberty"
+        }, 
+        {
+            "label" : "Canonical-mitaka", 
+            "value" : "Canonical-mitaka"
+        }, 
+        {
+            "label" : "Apex-Mitaka", 
+            "value" : "Apex-Mitaka"
+        }, 
+        {
+            "label" : "Devstack-Mitaka", 
+            "value" : "Devstack-Mitaka"
+        }, 
+        {
+            "label" : "packstack-7.0.0-0.10.dev1682", 
+            "value" : "packstack-7.0.0-0.10.dev1682"
+        }, 
+        {
+            "label" : "Stratoscale-v2.1.6", 
+            "value" : "Stratoscale-v2.1.6"
+        }, 
+        {
+            "label" : "Mirantis-9.1", 
+            "value" : "Mirantis-9.1"
+        }
+    ], 
+    "name" : "distributions"
+},
+{  
+    "name" : "message_source_systems", 
+    "data" : [
+        {
+            "value" : "OpenStack", 
+            "label" : "OpenStack"
+        }, 
+        {
+            "value" : "Calipso", 
+            "label" : "Calipso"
+        }, 
+        {
+            "value" : "Sensu", 
+            "label" : "Sensu"
+        }
+    ]
+},
+{ 
+    "name" : "object_types_for_links", 
+    "data" : [
+        {
+            "label" : "vnic", 
+            "value" : "vnic"
+        }, 
+        {
+            "label" : "vconnector", 
+            "value" : "vconnector"
+        }, 
+        {
+            "label" : "vedge", 
+            "value" : "vedge"
+        }, 
+        {
+            "label" : "instance", 
+            "value" : "instance"
+        }, 
+        {
+            "label" : "vservice", 
+            "value" : "vservice"
+        }, 
+        {
+            "label" : "switch_pnic",
+            "value" : "switch_pnic"
+        },
+        {
+            "label" : "network", 
+            "value" : "network"
+        }, 
+        {
+            "label" : "port", 
+            "value" : "port"
+        }, 
+        {
+            "label" : "otep", 
+            "value" : "otep"
+        }, 
+        {
+            "label" : "agent", 
+            "value" : "agent"
+        }, 
+        {
+            "label" : "host", 
+            "value" : "host"
+        }, 
+        {
+            "label" : "switch_pnic", 
+            "value" : "switch_pnic"
+        }, 
+        {
+            "label" : "switch", 
+            "value" : "switch"
+        }
+    ]
+},
+{ 
+    "name" : "scan_object_types", 
+    "data" : [
+        {
+            "label" : "vnic", 
+            "value" : "vnic"
+        }, 
+        {
+            "label" : "vconnector", 
+            "value" : "vconnector"
+        }, 
+        {
+            "label" : "vedge", 
+            "value" : "vedge"
+        }, 
+        {
+            "label" : "instance", 
+            "value" : "instance"
+        }, 
+        {
+            "label" : "vservice", 
+            "value" : "vservice"
+        },
+        {
+            "label" : "host_pnic",
+            "value" : "host_pnic"
+        },
+        {
+            "label" : "network", 
+            "value" : "network"
+        }, 
+        {
+            "label" : "port", 
+            "value" : "port"
+        }, 
+        {
+            "label" : "otep", 
+            "value" : "otep"
+        }, 
+        {
+            "label" : "agent", 
+            "value" : "agent"
+        }, 
+        {
+            "value" : "availability_zone", 
+            "label" : "availability_zone"
+        }, 
+        {
+            "value" : "regions_folder", 
+            "label" : "regions_folder"
+        }, 
+        {
+            "value" : "instances_folder", 
+            "label" : "instances_folder"
+        }, 
+        {
+            "value" : "pnics_folder", 
+            "label" : "pnics_folder"
+        }, 
+        {
+            "value" : "vconnectors_folder", 
+            "label" : "vconnectors_folder"
+        }, 
+        {
+            "value" : "vedges_folder", 
+            "label" : "vedges_folder"
+        }, 
+        {
+            "value" : "ports_folder", 
+            "label" : "ports_folder"
+        }, 
+        {
+            "value" : "aggregates_folder", 
+            "label" : "aggregates_folder"
+        }, 
+        {
+            "value" : "vservices_folder", 
+            "label" : "vservices_folder"
+        }, 
+        {
+            "value" : "vnics_folder", 
+            "label" : "vnics_folder"
+        }, 
+        {
+            "value" : "network_agent", 
+            "label" : "network_agent"
+        }, 
+        {
+            "value" : "project", 
+            "label" : "project"
+        }, 
+        {
+            "value" : "projects_folder", 
+            "label" : "projects_folder"
+        }, 
+        {
+            "value" : "aggregate", 
+            "label" : "aggregate"
+        }, 
+        {
+            "value" : "network_agents_folder", 
+            "label" : "network_agents_folder"
+        }, 
+        {
+            "value" : "host", 
+            "label" : "host"
+        }, 
+        {
+            "value" : "region", 
+            "label" : "region"
+        }, 
+        {
+            "value" : "host_ref", 
+            "label" : "host_ref"
+        }, 
+        {
+            "value" : "network_services_folder", 
+            "label" : "network_services_folder"
+        }, 
+        {
+            "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 e1b98ec..61c21f2 100644
--- a/app/install/db/link_types.json
+++ b/app/install/db/link_types.json
@@ -1,177 +1,184 @@
 [
 { 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "instance-vnic", 
     "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"
+    "type" : "instance-vnic"
 },
 { 
-    "endPointA" : "vconnector", 
-    "endPointB" : "vnic", 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vconnector-vnic", 
-    "description" : "vconnector-vnic"
-},
-{  
+    "description" : "vnic-vconnector", 
     "endPointA" : "vnic", 
     "endPointB" : "vconnector", 
-    "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vnic-vconnector", 
-    "description" : "vnic-vconnector"
+    "type" : "vnic-vconnector"
 },
-{  
+{ 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "vconnector-vedge", 
     "endPointA" : "vconnector", 
     "endPointB" : "vedge", 
-    "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vconnector-vedge", 
-    "description" : "vconnector-vedge"
+    "type" : "vconnector-vedge"
 },
-{  
-    "endPointA" : "vedge", 
-    "endPointB" : "vconnector", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vedge-vconnector", 
-    "description" : "vedge-vconnector"
-},
-{  
+    "description" : "vedge-otep", 
     "endPointA" : "vedge", 
     "endPointB" : "otep", 
+    "type" : "vedge-otep"
+},
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vedge-otep", 
-    "description" : "vedge-otep"
+    "description" : "vconnector-host_pnic", 
+    "endPointA" : "vconnector", 
+    "endPointB" : "host_pnic", 
+    "type" : "vconnector-host_pnic"
 },
-{  
-    "endPointA" : "otep", 
-    "endPointB" : "vedge", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "otep-vedge", 
-    "description" : "otep-vedge"
+    "description" : "host_pnic-network", 
+    "endPointA" : "host_pnic", 
+    "endPointB" : "network", 
+    "type" : "host_pnic-network"
 },
-{  
+{ 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "otep-vconnector", 
     "endPointA" : "otep", 
     "endPointB" : "vconnector", 
-    "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "otep-vconnector", 
-    "description" : "otep-vconnector"
+    "type" : "otep-vconnector"
 },
-{  
-    "endPointA" : "vconnector", 
-    "endPointB" : "otep", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vconnector-otep", 
-    "description" : "vconnector-otep"
-},
-{  
+    "description" : "vnic-vedge", 
     "endPointA" : "vnic", 
     "endPointB" : "vedge", 
+    "type" : "vnic-vedge"
+},
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vnic-vedge", 
-    "description" : "vnic-vedge"
+    "description" : "network-host_pnic", 
+    "endPointA" : "network", 
+    "endPointB" : "host_pnic", 
+    "type" : "network-host_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", 
-    "type" : "vedge-vnic", 
-    "description" : "vedge-vnic"
+    "description" : "vnic-instance", 
+    "endPointA" : "vnic", 
+    "endPointB" : "instance", 
+    "type" : "vnic-instance"
 },
-{  
+{ 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "vnic-vservice", 
     "endPointA" : "vnic", 
     "endPointB" : "vservice", 
-    "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vnic-vservice", 
-    "description" : "vnic-vservice"
+    "type" : "vnic-vservice"
 },
 { 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "vservice-vnic", 
     "endPointA" : "vservice", 
     "endPointB" : "vnic", 
-    "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vservice-vnic", 
-    "description" : "vservice-vnic"
+    "type" : "vservice-vnic"
 },
-{  
-    "endPointA" : "vconnector", 
-    "endPointB" : "host_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vconnector-host_pnic", 
-    "description" : "vconnector-host_pnic"
-},
-{  
+    "description" : "host_pnic-vconnector", 
     "endPointA" : "host_pnic", 
     "endPointB" : "vconnector", 
+    "type" : "host_pnic-vconnector"
+},
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "host_pnic-vconnector", 
-    "description" : "host_pnic-vconnector"
+    "description" : "vconnector-otep", 
+    "endPointA" : "vconnector", 
+    "endPointB" : "otep", 
+    "type" : "vconnector-otep"
 },
-{  
-    "endPointA" : "host_pnic", 
-    "endPointB" : "network", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "host_pnic-network", 
-    "description" : "host_pnic-network"
+    "description" : "otep-vedge", 
+    "endPointA" : "otep", 
+    "endPointB" : "vedge", 
+    "type" : "otep-vedge"
 },
-{  
-    "endPointA" : "network", 
-    "endPointB" : "host_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "network-host_pnic", 
-    "description" : "network-host_pnic"
+    "description" : "vedge-vnic", 
+    "endPointA" : "vedge", 
+    "endPointB" : "vnic", 
+    "type" : "vedge-vnic"
 },
-{  
-    "endPointA" : "host_pnic", 
-    "endPointB" : "vedge", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "host_pnic-vedge", 
-    "description" : "host_pnic-vedge"
+    "description" : "host_pnic-host", 
+    "endPointA" : "host_pnic", 
+    "endPointB" : "host", 
+    "type" : "host_pnic-host"
 },
-{  
-    "endPointA" : "vedge", 
-    "endPointB" : "host_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "vedge-host_pnic", 
-    "description" : "vedge-host_pnic"
+    "description" : "host-host_pnic", 
+    "endPointA" : "host", 
+    "endPointB" : "host_pnic", 
+    "type" : "host-host_pnic"
 },
-{  
-    "endPointA" : "host_pnic", 
-    "endPointB" : "otep", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "host_pnic-otep", 
-    "description" : "host_pnic-otep"
+    "description" : "host-network", 
+    "endPointA" : "host", 
+    "endPointB" : "network", 
+    "type" : "host-network"
 },
-{  
-    "endPointA" : "otep", 
-    "endPointB" : "host_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "otep-host_pnic", 
-    "description" : "otep-host_pnic"
+    "description" : "network-host", 
+    "endPointA" : "network", 
+    "endPointB" : "host", 
+    "type" : "network-host"
 },
-{  
-    "endPointA" : "switch_pnic", 
-    "endPointB" : "switch_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "switch_pnic-switch_pnic", 
-    "description" : "switch_pnic-switch_pnic"
+    "description" : "network-switch_pnic", 
+    "endPointA" : "network", 
+    "endPointB" : "switch_pnic", 
+    "type" : "network-switch_pnic"
 },
-{  
+{ 
+    "user_id" : "WS7j8oTbWPf3LbNne", 
+    "description" : "switch_pnic-network", 
     "endPointA" : "switch_pnic", 
-    "endPointB" : "host_pnic", 
+    "endPointB" : "network", 
+    "type" : "switch_pnic-network"
+},
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "switch_pnic-host_pnic", 
-    "description" : "switch_pnic-host_pnic"
+    "description" : "switch_pnic-switch", 
+    "endPointA" : "switch_pnic", 
+    "endPointB" : "switch", 
+    "type" : "switch_pnic-switch"
 },
-{  
-    "endPointA" : "host_pnic", 
-    "endPointB" : "switch_pnic", 
+{ 
     "user_id" : "WS7j8oTbWPf3LbNne", 
-    "type" : "host_pnic-switch_pnic", 
-    "description" : "host_pnic-switch_pnic"
+    "description" : "switch-switch_pnic", 
+    "endPointA" : "switch", 
+    "endPointB" : "switch_pnic", 
+    "type" : "switch-switch_pnic"
 }
 ]
-- 
cgit 1.2.3-korg