From: Koren Lev <korenlev@gmail.com>
Date: Sun, 10 Sep 2017 08:02:04 +0000 (+0300)
Subject: added scheme support for Mercury
X-Git-Tag: opnfv-5.1.RC1~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c1fe8357a6acb7294252da2554b8f0e8ba787525;p=calipso.git

added scheme support for Mercury

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

diff --git a/app/install/db/clique_types.json b/app/install/db/clique_types.json
index e973981..534e7d7 100644
--- a/app/install/db/clique_types.json
+++ b/app/install/db/clique_types.json
@@ -98,5 +98,42 @@
     ], 
     "name" : "network", 
     "focal_point_type" : "network"
+},
+{  
+    "environment" : "Mercury", 
+    "focal_point_type" : "instance", 
+    "link_types" : [
+        "instance-vnic", 
+        "vnic-vconnector", 
+        "vconnector-vedge", 
+        "vedge-host_pnic", 
+        "host_pnic-network"
+    ], 
+    "name" : "instance_vconnector_clique"
+},
+{ 
+    "environment" : "Mercury", 
+    "link_types" : [
+        "vservice-vnic",
+        "vnic-vedge", 
+        "vedge-pnic", 
+        "pnic-network"
+    ], 
+    "focal_point_type" : "vservice", 
+    "name" : "vservice_vedge_clique"
+},
+{ 
+    "environment" : "Mercury", 
+    "focal_point_type" : "network", 
+    "link_types" : [
+        "network-host_pnic", 
+        "host_pnic-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 7a5b795..3848d1d 100644
--- a/app/install/db/constants.json
+++ b/app/install/db/constants.json
@@ -502,6 +502,10 @@
         {
             "value" : "Apex-Euphrates",
             "label" : "Apex-Euphrates"
+        },
+        {
+            "label" : "Mercury_10239", 
+            "value" : "Mercury_10239"
         }
     ], 
     "name" : "distributions"
diff --git a/app/install/db/supported_environments.json b/app/install/db/supported_environments.json
index 606f5ef..c5cd0ef 100644
--- a/app/install/db/supported_environments.json
+++ b/app/install/db/supported_environments.json
@@ -11,6 +11,18 @@
         "listening" : true
     }
 },
+{  
+    "environment" : {
+        "type_drivers" : "vlan", 
+        "mechanism_drivers" : "OVS", 
+        "distribution" : "Mercury_10239"
+    }, 
+    "features" : {
+        "monitoring" : false, 
+        "scanning" : true, 
+        "listening" : true
+    }
+},
 {
     "environment" : {
         "distribution" : "Apex-Euphrates",