From d32f75145676bacefde0d08a14680a5984623451 Mon Sep 17 00:00:00 2001
From: Koren Lev <korenlev@gmail.com>
Date: Fri, 29 Sep 2017 01:38:18 +0300
Subject: release 1.0 calipso for opnfv apex

Change-Id: I3e63cd27c5f4d3756e67a07c749863a68e84dde2
Signed-off-by: Koren Lev <korenlev@gmail.com>
---
 .../resource/test_environment_configs.py           | 22 ++++++++++++++++------
 app/test/api/responders_test/test_data/base.py     | 11 +++++------
 .../test_data/environment_configs.py               | 16 ++++++++++++----
 3 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'app/test/api/responders_test')

diff --git a/app/test/api/responders_test/resource/test_environment_configs.py b/app/test/api/responders_test/resource/test_environment_configs.py
index 7002ed7..6356f06 100644
--- a/app/test/api/responders_test/resource/test_environment_configs.py
+++ b/app/test/api/responders_test/resource/test_environment_configs.py
@@ -72,12 +72,21 @@ class TestEnvironmentConfigs(TestBase):
                                   },
                                   expected_code=base.BAD_REQUEST_CODE)
 
+    def test_get_environment_configs_list_with_wrong_distribution_version(self):
+        self.validate_get_request(environment_configs.URL,
+                                  params={
+                                      "distribution_version":
+                                          environment_configs.WRONG_DIST_VER
+                                  },
+                                  expected_code=base.BAD_REQUEST_CODE)
+
     @patch(base.RESPONDER_BASE_READ)
     def test_get_environment_configs_list_with_distribution(self, read):
         self.validate_get_request(environment_configs.URL,
                                   params={
                                       "distribution":
-                                          environment_configs.CORRECT_DISTRIBUTION
+                                          environment_configs.
+                                          CORRECT_DISTRIBUTION
                                   },
                                   mocks={
                                       read: environment_configs.
@@ -377,11 +386,12 @@ class TestEnvironmentConfigs(TestBase):
 
     def mock_validate_env_config_with_supported_envs(self, scanning,
                                                      monitoring, listening):
-        InventoryMgr.is_feature_supported_in_env = lambda self, matches, feature: {
-            EnvironmentFeatures.SCANNING: scanning,
-            EnvironmentFeatures.MONITORING: monitoring,
-            EnvironmentFeatures.LISTENING: listening
-        }[feature]
+        InventoryMgr.is_feature_supported_in_env = \
+            lambda self, matches, feature: {
+                EnvironmentFeatures.SCANNING: scanning,
+                EnvironmentFeatures.MONITORING: monitoring,
+                EnvironmentFeatures.LISTENING: listening
+            }[feature]
 
     @patch(base.RESPONDER_BASE_WRITE)
     def test_post_environment_config(self, write):
diff --git a/app/test/api/responders_test/test_data/base.py b/app/test/api/responders_test/test_data/base.py
index d320340..b99d5bb 100644
--- a/app/test/api/responders_test/test_data/base.py
+++ b/app/test/api/responders_test/test_data/base.py
@@ -53,7 +53,9 @@ WRONG_ENV_TYPE = ""
 CORRECT_ENV_TYPE = "development"
 
 WRONG_DISTRIBUTION = "wrong-environment"
-CORRECT_DISTRIBUTION = "Mirantis-6.0"
+WRONG_DIST_VER = "wrong-environment"
+CORRECT_DISTRIBUTION = "Mirantis"
+CORRECT_DIST_VER = "6.0"
 
 WRONG_OBJECT_ID = "58a2406e6a283a8bee15d43"
 CORRECT_OBJECT_ID = "58a2406e6a283a8bee15d43f"
@@ -150,11 +152,8 @@ CONSTANTS_BY_NAMES = {
         "production"
     ],
     "distributions": [
-        "Mirantis-6.0",
-        "Mirantis-7.0",
-        "Mirantis-8.0",
-        "Mirantis-9.0",
-        "RDO-Juno"
+        "Mirantis",
+        "RDO"
     ],
     "environment_operational_status": [
         "stopped",
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 a9e8885..4cea105 100644
--- a/app/test/api/responders_test/test_data/environment_configs.py
+++ b/app/test/api/responders_test/test_data/environment_configs.py
@@ -15,7 +15,9 @@ URL = "/environment_configs"
 NAME = "Mirantis-Liberty-API"
 UNKNOWN_NAME = "UNKNOWN NAME"
 WRONG_DISTRIBUTION = base.WRONG_DISTRIBUTION
+WRONG_DIST_VER = base.WRONG_DIST_VER
 CORRECT_DISTRIBUTION = base.CORRECT_DISTRIBUTION
+CORRECT_DIST_VER = base.CORRECT_DIST_VER
 WRONG_MECHANISM_DRIVER = base.WRONG_MECHANISM_DRIVER
 CORRECT_MECHANISM_DRIVER = base.CORRECT_MECHANISM_DRIVER
 WRONG_TYPE_DRIVER = base.WRONG_TYPE_DRIVER
@@ -29,11 +31,13 @@ BOOL_LISTEN = BOOL_SCANNED = \
 
 ENV_CONFIGS = [
     {
-        "distribution": "Mirantis-8.0",
+        "distribution": "Mirantis",
+        "distribution_version": "8.0",
         "name": "Mirantis-Liberty-API"
     },
     {
-        "distribution": "Mirantis-9.0",
+        "distribution": "Mirantis",
+        "distribution_version": "9.0",
         "name": "Mirantis-Liberty"
     }
 ]
@@ -44,7 +48,8 @@ ENV_CONFIGS_RESPONSE = {
 
 ENV_CONFIGS_WITH_SPECIFIC_NAME = [
     {
-        "distribution": "Mirantis-8.0",
+        "distribution": "Mirantis",
+        "distribution_version": "8.0",
         "name": NAME
     }
 ]
@@ -52,10 +57,12 @@ ENV_CONFIGS_WITH_SPECIFIC_NAME = [
 ENV_CONFIGS_WITH_SPECIFIC_DISTRIBUTION = [
     {
         "distribution": CORRECT_DISTRIBUTION,
+        "distribution_version": CORRECT_DIST_VER,
         "name": "Mirantis-Liberty-API",
     },
     {
         "distribution": CORRECT_DISTRIBUTION,
+        "distribution_version": CORRECT_DIST_VER,
         "name": "Mirantis-Liberty"
     }
 ]
@@ -206,7 +213,8 @@ ENV_CONFIG = {
             "type": "Sensu"
         }
     ],
-    "distribution": "Mirantis-8.0",
+    "distribution": "Mirantis",
+    "distribution_version": "8.0",
     "last_scanned": "2017-03-16T11:14:54Z",
     "listen": True,
     "mechanism_drivers": [
-- 
cgit 1.2.3-korg