release 1.2 + new tagging

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

3 files changed, 151 insertions, 127 deletions

diff --git a/app/test/api/responders_test/test_data/base.py b/app/test/api/responders_test/test_data/base.py
index b99d5bb..6d2422a 100644
--- a/app/test/api/responders_test/test_data/base.py
+++ b/app/test/api/responders_test/test_data/base.py
@@ -16,14 +16,14 @@ UNAUTHORIZED_CODE = "401"
 CREATED_CODE = "201"
 
 ENV_NAME = "Mirantis-Liberty-API"
-UNKNOWN_ENV = "Unkown-Environment"
+UNKNOWN_ENV = "Unknown-Environment"
 NON_INT_PAGE = 1.4
 INT_PAGE = 1
 NON_INT_PAGESIZE = 2.4
 INT_PAGESIZE = 2
 
 WRONG_LINK_TYPE = "instance-host"
-CORRECT_LINK_TYPE= "instance-vnic"
+CORRECT_LINK_TYPE = "instance-vnic"
 
 WRONG_LINK_STATE = "wrong"
 CORRECT_LINK_STATE = "up"
@@ -41,7 +41,7 @@ WRONG_TYPE_DRIVER = "wrong_type"
 CORRECT_TYPE_DRIVER = "local"
 
 WRONG_MECHANISM_DRIVER = "wrong-mechanism-dirver"
-CORRECT_MECHANISM_DRIVER = "ovs"
+CORRECT_MECHANISM_DRIVER = "OVS"
 
 WRONG_LOG_LEVEL = "wrong-log-level"
 CORRECT_LOG_LEVEL = "critical"
@@ -71,16 +71,32 @@ NON_DICT_OBJ = ""
 CONSTANTS_BY_NAMES = {
     "link_types": [
         "instance-vnic",
-        "otep-vconnector",
-        "otep-host_pnic",
+        "vnic-instance",
+        "vnic-vconnector",
+        "vconnector-vnic",
+        "vconnector-vedge",
+        "vedge-vconnector",
+        "vedge-host_pnic",
+        "host_pnic-vedge",
         "host_pnic-network",
+        "network-host_pnic",
         "vedge-otep",
-        "vnic-vconnector",
+        "otep-vedge",
+        "otep-vconnector",
+        "vconnector-otep",
+        "otep-host_pnic",
+        "host_pnic-otep",
         "vconnector-host_pnic",
-        "vconnector-vedge",
+        "host_pnic-vconnector",
         "vnic-vedge",
-        "vedge-host_pnic",
-        "vservice-vnic"
+        "vedge-vnic",
+        "vservice-vnic",
+        "vnic-vservice",
+        "switch_pnic-host_pnic",
+        "host_pnic-switch_pnic",
+        "switch_pnic-switch_pnic",
+        "switch_pnic-switch",
+        "switch-switch_pnic"
     ],
     "link_states": [
         "up",
@@ -117,9 +133,9 @@ CONSTANTS_BY_NAMES = {
         "flat"
     ],
     "mechanism_drivers": [
-        "ovs",
-        "vpp",
-        "LinuxBridge",
+        "OVS",
+        "VPP",
+        "LXB",
         "Arista",
         "Nexus"
     ],
@@ -155,6 +171,10 @@ CONSTANTS_BY_NAMES = {
         "Mirantis",
         "RDO"
     ],
+    "distribution_versions": [
+        "8.0",
+        "9.0"
+    ],
     "environment_operational_status": [
         "stopped",
         "running",
@@ -168,6 +188,30 @@ CONSTANTS_BY_NAMES = {
     ],
     "environment_monitoring_types": [
        "Sensu"
+    ],
+    "scans_statuses": [
+        "draft",
+        "pending",
+        "running",
+        "completed",
+        "completed_with_errors",
+        "failed",
+        "aborted"
+    ],
+    "configuration_targets": [
+        "AMQP",
+        "CLI",
+        "ACI",
+        "mysql",
+        "OpenStack",
+        "Monitoring",
+        "Kubernetes"
+    ],
+    "environment_types": [
+        "OpenStack",
+        "Kubernetes",
+        "VMware",
+        "Bare-metal"
     ]
 }
 
@@ -175,7 +219,8 @@ CONSTANTS_BY_NAMES = {
 RESPONDER_BASE_PATH = "api.responders.responder_base.ResponderBase"
 RESPONDER_BASE_GET_OBJECTS_LIST = RESPONDER_BASE_PATH + ".get_objects_list"
 RESPONDER_BASE_GET_OBJECT_BY_ID = RESPONDER_BASE_PATH + ".get_object_by_id"
-RESPONDER_BASE_CHECK_ENVIRONMENT_NAME = RESPONDER_BASE_PATH + ".check_environment_name"
+RESPONDER_BASE_CHECK_ENVIRONMENT_NAME = \
+    RESPONDER_BASE_PATH + ".check_environment_name"
 RESPONDER_BASE_READ = RESPONDER_BASE_PATH + ".read"
 RESPONDER_BASE_WRITE = RESPONDER_BASE_PATH + ".write"
 RESPONDER_BASE_AGGREGATE = RESPONDER_BASE_PATH + ".aggregate"
diff --git a/app/test/api/responders_test/test_data/clique_types.py b/app/test/api/responders_test/test_data/clique_types.py
index ae962ce..0791bdf 100644
--- a/app/test/api/responders_test/test_data/clique_types.py
+++ b/app/test/api/responders_test/test_data/clique_types.py
@@ -8,13 +8,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0                                  #
 ###############################################################################
 from test.api.responders_test.test_data import base
-
+from test.api.responders_test.test_data.base import WRONG_MECHANISM_DRIVER, \
+    CORRECT_MECHANISM_DRIVER, CORRECT_TYPE_DRIVER, WRONG_TYPE_DRIVER, \
+    CORRECT_DISTRIBUTION, CORRECT_DIST_VER
 
 URL = "/clique_types"
 
 WRONG_ID = base.WRONG_OBJECT_ID
 NONEXISTENT_ID = "58ca73ae3a8a836d10ff3b44"
 CORRECT_ID = base.CORRECT_OBJECT_ID
+SAMPLE_IDS = ['58ca73ae3a8a836d10ff3b80', '58ca73ae3a8a836d10ff3b81']
+
+RESERVED_ENV_NAME = 'ANY'
 
 WRONG_FOCAL_POINT_TYPE = base.WRONG_OBJECT_TYPE
 CORRECT_FOCAL_POINT_POINT_TYPE = base.CORRECT_OBJECT_TYPE
@@ -23,25 +28,52 @@ WRONG_LINK_TYPE = base.WRONG_LINK_TYPE
 NONEXISTENT_LINK_TYPE = "otep-host_pnic"
 CORRECT_LINK_TYPE = base.CORRECT_LINK_TYPE
 
+CLIQUE_TYPE = {
+    "environment": "Mirantis-Liberty-API",
+    "name": "instance_vconnector_clique",
+    "link_types": [
+        "instance-vnic",
+        "vnic-vconnector"
+    ],
+    "focal_point_type": "instance"
+}
+
+TEST_CONFIGURATION = {
+    "distribution": CORRECT_DISTRIBUTION,
+    "distribution_version": CORRECT_DIST_VER,
+    "mechanism_drivers": CORRECT_MECHANISM_DRIVER,
+    "type_drivers": CORRECT_TYPE_DRIVER
+}
+
+
+def get_payload(update: dict = None, delete: list = None):
+    payload = CLIQUE_TYPE.copy()
+    if update:
+        payload.update(update)
+    if delete:
+        for k in delete:
+            del payload[k]
+    return payload
+
+
 CLIQUE_TYPES_WITH_SPECIFIC_ID = [
-    {
-       "environment": "Mirantis-Liberty-API",
-       "focal_point_type": "host_pnic",
-       "id": CORRECT_ID
-    }
+    get_payload(update={'id': CORRECT_ID})
+]
+
+CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION = [
+    get_payload(update={'id': SAMPLE_IDS[0],
+                        **TEST_CONFIGURATION},
+                delete=['environment'])
 ]
 
+CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION_RESPONSE = {
+    "clique_types": CLIQUE_TYPES_WITH_SPECIFIC_CONFIGURATION
+}
+
 CLIQUE_TYPES_WITH_SPECIFIC_FOCAL_POINT_TYPE = [
-    {
-       "environment": "Mirantis-Liberty-API",
-       "focal_point_type": CORRECT_FOCAL_POINT_POINT_TYPE,
-       "id": "58ca73ae3a8a836d10ff3b80"
-    },
-    {
-       "environment": "Mirantis-Liberty-API",
-       "focal_point_type": CORRECT_FOCAL_POINT_POINT_TYPE,
-       "id": "58ca73ae3a8a836d10ff3b81"
-    }
+    get_payload(update={'id': _id,
+                        'focal_point_type': CORRECT_FOCAL_POINT_POINT_TYPE})
+    for _id in SAMPLE_IDS
 ]
 
 CLIQUE_TYPES_WITH_SPECIFIC_FOCAL_POINT_TYPE_RESPONSE = {
@@ -49,20 +81,9 @@ CLIQUE_TYPES_WITH_SPECIFIC_FOCAL_POINT_TYPE_RESPONSE = {
 }
 
 CLIQUE_TYPES_WITH_SPECIFIC_LINK_TYPE = [
-    {
-       "environment": "Mirantis-Liberty-API",
-       "link_types": [
-          CORRECT_LINK_TYPE
-       ],
-       "id": "58ca73ae3a8a836d10ff3b80"
-    },
-    {
-       "environment": "Mirantis-Liberty-API",
-       "link_types": [
-           CORRECT_LINK_TYPE
-       ],
-       "id": "58ca73ae3a8a836d10ff3b81"
-    }
+    get_payload(update={'id': _id,
+                        'link_types': [CORRECT_LINK_TYPE]})
+    for _id in SAMPLE_IDS
 ]
 
 CLIQUE_TYPES_WITH_SPECIFIC_LINK_TYPE_RESPONSE = {
@@ -70,16 +91,7 @@ CLIQUE_TYPES_WITH_SPECIFIC_LINK_TYPE_RESPONSE = {
 }
 
 CLIQUE_TYPES = [
-    {
-       "environment": "Mirantis-Liberty-API",
-       "focal_point_type": "vnic",
-       "id": "58ca73ae3a8a836d10ff3b80"
-    },
-    {
-       "environment": "Mirantis-Liberty-API",
-       "focal_point_type": "vnic",
-       "id": "58ca73ae3a8a836d10ff3b81"
-    }
+    get_payload(update={'id': _id}) for _id in SAMPLE_IDS
 ]
 
 CLIQUE_TYPES_RESPONSE = {
@@ -88,83 +100,48 @@ CLIQUE_TYPES_RESPONSE = {
 
 NON_DICT_CLIQUE_TYPE = base.NON_DICT_OBJ
 
-CLIQUE_TYPE_WITHOUT_ENVIRONMENT = {
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector"
-    ],
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITH_RESERVED_NAME = get_payload(
+    update={'environment': RESERVED_ENV_NAME}
+)
 
-CLIQUE_TYPE_WITH_UNKNOWN_ENVIRONMENT = {
-    "environment": base.UNKNOWN_ENV,
-    "id": "589a3969761b0555a3ef6093",
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector"
-    ],
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITHOUT_ENV_NAME_AND_CONF = get_payload(
+    delete=['environment']
+)
 
-CLIQUE_TYPE_WITHOUT_FOCAL_POINT_TYPE = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector"
-    ]
-}
+CLIQUE_TYPE_WITH_BOTH_ENV_AND_CONF = get_payload(
+    update=TEST_CONFIGURATION
+)
 
-CLIQUE_TYPE_WITH_WRONG_FOCAL_POINT_TYPE = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector"
-    ],
-    "focal_point_type": WRONG_FOCAL_POINT_TYPE
-}
+CLIQUE_TYPE_WITH_INSUFFICIENT_CONF = get_payload(
+    update={'distribution_version': CORRECT_DIST_VER}
+)
 
-CLIQUE_TYPE_WITHOUT_LINK_TYPES = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITH_UNKNOWN_ENVIRONMENT = get_payload(
+    update={'environment': base.UNKNOWN_ENV}
+)
 
-CLIQUE_TYPE_WITH_NON_LIST_LINK_TYPES = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "link_types": "instance-vnic",
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITHOUT_FOCAL_POINT_TYPE = get_payload(delete=['focal_point_type'])
 
-CLIQUE_TYPE_WITH_WRONG_LINK_TYPE = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        WRONG_LINK_TYPE,
-        "vnic-vconnector"
-    ],
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITH_WRONG_FOCAL_POINT_TYPE = get_payload(
+    update={'focal_point_type': WRONG_FOCAL_POINT_TYPE}
+)
 
-CLIQUE_TYPE_WITHOUT_NAME = {
-    "environment": "Mirantis-Liberty-API",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector",
-    ],
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITHOUT_LINK_TYPES = get_payload(delete=['link_types'])
 
-CLIQUE_TYPE = {
-    "environment": "Mirantis-Liberty-API",
-    "name": "instance_vconnector_clique",
-    "link_types": [
-        "instance-vnic",
-        "vnic-vconnector"
-    ],
-    "focal_point_type": "instance"
-}
+CLIQUE_TYPE_WITH_NON_LIST_LINK_TYPES = get_payload(
+    update={'link_types': "instance-vnic"}
+)
+
+CLIQUE_TYPE_WITH_WRONG_LINK_TYPE = get_payload(
+    update={'link_types': [WRONG_LINK_TYPE, "vnic-vconnector"]}
+)
+
+CLIQUE_TYPE_WITHOUT_NAME = get_payload(delete=['name'])
+
+CLIQUE_TYPE_WITH_WRONG_MECH_DRIVERS = get_payload(
+    update={'mechanism_drivers': WRONG_MECHANISM_DRIVER}
+)
+
+CLIQUE_TYPE_WITH_WRONG_TYPE_DRIVERS = get_payload(
+    update={'type_drivers': WRONG_TYPE_DRIVER}
+)
\ No newline at end of file
diff --git a/app/test/api/responders_test/test_data/environment_configs.py b/app/test/api/responders_test/test_data/environment_configs.py
index 4cea105..3e976ec 100644
--- a/app/test/api/responders_test/test_data/environment_configs.py
+++ b/app/test/api/responders_test/test_data/environment_configs.py
@@ -201,6 +201,7 @@ ENV_CONFIG = {
             "provision": "None",
             "env_type": "development",
             "name": "Monitoring",
+            "install_monitoring_client": True,
             "api_port": "4567",
             "rabbitmq_port": "5671",
             "rabbitmq_pass": "sensuaccess",
@@ -218,12 +219,13 @@ ENV_CONFIG = {
     "last_scanned": "2017-03-16T11:14:54Z",
     "listen": True,
     "mechanism_drivers": [
-        "ovs"
+        "OVS"
     ],
     "name": "Mirantis-Liberty",
     "operational": "running",
     "scanned": True,
     "type": "environment",
     "type_drivers": "vxlan",
-    "user": "WS7j8oTbWPf3LbNne"
+    "user": "WS7j8oTbWPf3LbNne",
+    "environment_type": "OpenStack"
 }