From 6046937f080b80be4fd04a17cbc6cfda27a97a5d Mon Sep 17 00:00:00 2001 From: Koren Lev Date: Sat, 12 Aug 2017 11:32:35 +0300 Subject: fixes and re-scheme for host_pnic and switch_pnic Change-Id: I3e5501dd9beb100a66c5a7bdba6e5cd967f4a21c Signed-off-by: Koren Lev --- app/install/db/clique_types.json | 28 +++--- app/install/db/constants.json | 122 +++++++++++++------------ app/install/db/link_types.json | 187 +++++++++++++++++++-------------------- 3 files changed, 174 insertions(+), 163 deletions(-) (limited to 'app/install/db') diff --git a/app/install/db/clique_types.json b/app/install/db/clique_types.json index 575d083..239f5a2 100644 --- a/app/install/db/clique_types.json +++ b/app/install/db/clique_types.json @@ -13,17 +13,6 @@ ], "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", @@ -52,5 +41,22 @@ "vnic-vservice" ], "name" : "network" +}, +{ + "focal_point_type" : "switch_pnic", + "environment" : "ANY", + "link_types" : [ + "switch_pnic-switch-pnic", + "switch_pnic-host_pnic", + "host_pnic-vconnector", + "vconnector-otep", + "otep-vedge", + "vedge-vconnector", + "vedge-vnic", + "vconnector-vnic", + "vnic-instance", + "vnic-vservice" + ], + "name" : "switch_pnic clique" } ] diff --git a/app/install/db/constants.json b/app/install/db/constants.json index a30ffa9..3f7204f 100644 --- a/app/install/db/constants.json +++ b/app/install/db/constants.json @@ -176,76 +176,100 @@ "value" : "instance-vnic" }, { - "label" : "otep-vconnector", - "value" : "otep-vconnector" + "label" : "vnic-instance", + "value" : "vnic-instance" }, { - "label" : "otep-host_pnic", - "value" : "otep-host_pnic" + "label" : "vnic-vconnector", + "value" : "vnic-vconnector" + }, + { + "label" : "vconnector-vnic", + "value" : "vconnector-vnic" + }, + { + "label" : "vconnector-vedge", + "value" : "vconnector-vedge" + }, + { + "label" : "vedge-vconnector", + "value" : "vedge-vconnector" + }, + { + "label" : "vedge-host_pnic", + "value" : "vedge-host_pnic" + }, + { + "label" : "host_pnic-vedge", + "value" : "host_pnic-vedge" }, { "label" : "host_pnic-network", "value" : "host_pnic-network" }, + { + "label" : "network-host_pnic", + "value" : "network-host_pnic" + }, { "label" : "vedge-otep", "value" : "vedge-otep" }, { - "label" : "vnic-vconnector", - "value" : "vnic-vconnector" + "label" : "otep-vedge", + "value" : "otep-vedge" }, { - "label" : "vconnector-host_pnic", - "value" : "vconnector-host_pnic" + "label" : "otep-vconnector", + "value" : "otep-vconnector" }, { - "label" : "vnic-vedge", - "value" : "vnic-vedge" + "label" : "vconnector-otep", + "value" : "vconnector-otep" }, { - "label" : "vconnector-vedge", - "value" : "vconnector-vedge" + "label" : "otep-host_pnic", + "value" : "otep-host_pnic" }, { - "label" : "vedge-host_pnic", - "value" : "vedge-host_pnic" + "label" : "host_pnic-otep", + "value" : "host_pnic-otep" }, { - "label" : "vservice-vnic", - "value" : "vservice-vnic" + "label" : "vconnector-host_pnic", + "value" : "vconnector-host_pnic" }, { - "label" : "host_pnic-host", - "value" : "host_pnic-host" + "label" : "host_pnic-vconnector", + "value" : "host_pnic-vconnector" }, { - "label" : "host-host_pnic", - "value" : "host-host_pnic" + "label" : "vnic-vedge", + "value" : "vnic-vedge" }, { - "label" : "host-network", - "value" : "host-network" + "label" : "vedge-vnic", + "value" : "vedge-vnic" }, { - "label" : "network-host", - "value" : "network-host" + "label" : "vservice-vnic", + "value" : "vservice-vnic" }, { - "label" : "switch_pnic-network", - "value" : "switch_pnic-network" + "label" : "vnic-vservice", + "value" : "vnic-vservice" }, { - "label" : "network-switch_pnic", - "value" : "network-switch_pnic" + "label" : "switch_pnic-host_pnic", + "value" : "switch_pnic-host_pnic" }, { - "label" : "switch_pnic-switch", - "value" : "switch_pnic-switch" + "label" : "host_pnic-switch_pnic", + "value" : "host_pnic-switch_pnic" }, { - "label" : "switch-switch_pnic", - "value" : "switch-switch_pnic" + "label" : "switch_pnic-switch_pnic", + "value" : "switch_pnic-switch_pnic" } ] }, @@ -326,9 +350,17 @@ "label" : "host_pnic", "value" : "host_pnic" }, + { + "label" : "switch_pnic", + "value" : "switch_pnic" + }, { "label" : "network", "value" : "network" + }, + { + "label" : "switch", + "value" : "switch" }, { "label" : "port", @@ -345,15 +377,7 @@ { "label" : "host", "value" : "host" - }, - { - "label" : "switch_pnic", - "value" : "switch_pnic" - }, - { - "label" : "switch", - "value" : "switch" - } + } ] }, { @@ -503,29 +527,17 @@ "value" : "vservice" }, { - "label" : "switch_pnic", - "value" : "switch_pnic" + "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" diff --git a/app/install/db/link_types.json b/app/install/db/link_types.json index 61c21f2..f8e3e93 100644 --- a/app/install/db/link_types.json +++ b/app/install/db/link_types.json @@ -1,184 +1,177 @@ [ { + "endPointB" : "vnic", + "type" : "instance-vnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "instance-vnic", "endPointA" : "instance", - "endPointB" : "vnic", - "type" : "instance-vnic" + "description" : "instance-vnic" }, { + "endPointB" : "instance", + "type" : "vnic-instance", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vnic-vconnector", "endPointA" : "vnic", - "endPointB" : "vconnector", - "type" : "vnic-vconnector" + "description" : "vnic-instance" }, { + "endPointB" : "vnic", + "type" : "vconnector-vnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vconnector-vedge", "endPointA" : "vconnector", - "endPointB" : "vedge", - "type" : "vconnector-vedge" + "description" : "vconnector-vnic" }, { + "endPointB" : "vconnector", + "type" : "vnic-vconnector", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vedge-otep", - "endPointA" : "vedge", - "endPointB" : "otep", - "type" : "vedge-otep" + "endPointA" : "vnic", + "description" : "vnic-vconnector" }, { + "endPointB" : "vedge", + "type" : "vconnector-vedge", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vconnector-host_pnic", "endPointA" : "vconnector", - "endPointB" : "host_pnic", - "type" : "vconnector-host_pnic" + "description" : "vconnector-vedge" }, { + "endPointB" : "vconnector", + "type" : "vedge-vconnector", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "host_pnic-network", - "endPointA" : "host_pnic", - "endPointB" : "network", - "type" : "host_pnic-network" + "endPointA" : "vedge", + "description" : "vedge-vconnector" }, { + "endPointB" : "otep", + "type" : "vedge-otep", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "otep-vconnector", - "endPointA" : "otep", - "endPointB" : "vconnector", - "type" : "otep-vconnector" + "endPointA" : "vedge", + "description" : "vedge-otep" }, { - "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vnic-vedge", - "endPointA" : "vnic", "endPointB" : "vedge", - "type" : "vnic-vedge" -}, -{ + "type" : "otep-vedge", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "network-host_pnic", - "endPointA" : "network", - "endPointB" : "host_pnic", - "type" : "network-host_pnic" + "endPointA" : "otep", + "description" : "otep-vedge" }, { - "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vedge-vconnector", - "endPointA" : "vedge", "endPointB" : "vconnector", - "type" : "vedge-vconnector" + "type" : "otep-vconnector", + "user_id" : "WS7j8oTbWPf3LbNne", + "endPointA" : "otep", + "description" : "otep-vconnector" }, { + "endPointB" : "otep", + "type" : "vconnector-otep", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vconnector-vnic", "endPointA" : "vconnector", - "endPointB" : "vnic", - "type" : "vconnector-vnic" + "description" : "vconnector-otep" }, { + "endPointB" : "vedge", + "type" : "vnic-vedge", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vnic-instance", "endPointA" : "vnic", - "endPointB" : "instance", - "type" : "vnic-instance" + "description" : "vnic-vedge" }, { + "endPointB" : "vnic", + "type" : "vedge-vnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vnic-vservice", - "endPointA" : "vnic", - "endPointB" : "vservice", - "type" : "vnic-vservice" + "endPointA" : "vedge", + "description" : "vedge-vnic" }, { + "endPointB" : "vservice", + "type" : "vnic-vservice", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vservice-vnic", - "endPointA" : "vservice", - "endPointB" : "vnic", - "type" : "vservice-vnic" + "endPointA" : "vnic", + "description" : "vnic-vservice" }, { + "endPointB" : "vnic", + "type" : "vservice-vnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "host_pnic-vconnector", - "endPointA" : "host_pnic", - "endPointB" : "vconnector", - "type" : "host_pnic-vconnector" + "endPointA" : "vservice", + "description" : "vservice-vnic" }, { + "endPointB" : "host_pnic", + "type" : "vconnector-host_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vconnector-otep", "endPointA" : "vconnector", - "endPointB" : "otep", - "type" : "vconnector-otep" + "description" : "vconnector-host_pnic" }, { + "endPointB" : "vconnector", + "type" : "host_pnic-vconnector", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "otep-vedge", - "endPointA" : "otep", - "endPointB" : "vedge", - "type" : "otep-vedge" + "endPointA" : "host_pnic", + "description" : "host_pnic-vconnector" }, { + "endPointB" : "network", + "type" : "host_pnic-network", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "vedge-vnic", - "endPointA" : "vedge", - "endPointB" : "vnic", - "type" : "vedge-vnic" + "endPointA" : "host_pnic", + "description" : "host_pnic-network" }, { + "endPointB" : "host_pnic", + "type" : "network-host_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "host_pnic-host", - "endPointA" : "host_pnic", - "endPointB" : "host", - "type" : "host_pnic-host" + "endPointA" : "network", + "description" : "network-host_pnic" }, { + "endPointB" : "vedge", + "type" : "host_pnic-vedge", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "host-host_pnic", - "endPointA" : "host", - "endPointB" : "host_pnic", - "type" : "host-host_pnic" + "endPointA" : "host_pnic", + "description" : "host_pnic-vedge" }, { + "endPointB" : "host_pnic", + "type" : "vedge-host_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "host-network", - "endPointA" : "host", - "endPointB" : "network", - "type" : "host-network" + "endPointA" : "vedge", + "description" : "vedge-host_pnic" }, { + "endPointB" : "otep", + "type" : "host_pnic-otep", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "network-host", - "endPointA" : "network", - "endPointB" : "host", - "type" : "network-host" + "endPointA" : "host_pnic", + "description" : "host_pnic-otep" }, { + "endPointB" : "host_pnic", + "type" : "otep-host_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "network-switch_pnic", - "endPointA" : "network", - "endPointB" : "switch_pnic", - "type" : "network-switch_pnic" + "endPointA" : "otep", + "description" : "otep-host_pnic" }, { + "endPointB" : "switch_pnic", + "type" : "switch_pnic-switch_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "switch_pnic-network", "endPointA" : "switch_pnic", - "endPointB" : "network", - "type" : "switch_pnic-network" + "description" : "switch_pnic-switch_pnic" }, { + "endPointB" : "host_pnic", + "type" : "switch_pnic-host_pnic", "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "switch_pnic-switch", "endPointA" : "switch_pnic", - "endPointB" : "switch", - "type" : "switch_pnic-switch" + "description" : "switch_pnic-host_pnic" }, { - "user_id" : "WS7j8oTbWPf3LbNne", - "description" : "switch-switch_pnic", - "endPointA" : "switch", "endPointB" : "switch_pnic", - "type" : "switch-switch_pnic" + "type" : "host_pnic-switch_pnic", + "user_id" : "WS7j8oTbWPf3LbNne", + "endPointA" : "host_pnic", + "description" : "host_pnic-switch_pnic" } ] -- cgit 1.2.3-korg