[VVP] Misc tweaks and fixes to preload generation

* Use VALUE_FOR if value is still CHANGE me in .env file
* Fix issues with improper parameters being put in VNF parameters in
  the preload
* Fix issue where lists of parameter values pulled from env file could
  only be put in one template
* Exclude platform provided parameters from VNF parameters in preload
* Fixed issues with parameter validations
* Updated heat requirements
* implemented missing test for new requirement that all incremental
  modules must have a nova server

Issue-ID: VVP-312
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Change-Id: I1a1225097544b690fb9b854c8a3d9e036f694d6a

4 files changed, 17 insertions, 11 deletions

diff --git a/ice_validator/app_tests/preload_tests/sample_heat/base.yaml b/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
index fdf34e0..1a7dd4d 100644
--- a/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
+++ b/ice_validator/app_tests/preload_tests/sample_heat/base.yaml
@@ -224,7 +224,7 @@ resources:
     properties:
       network: { get_param: oam_net_id }
       fixed_ips: 
-        - subnet_id: { get_param: oam_subnet_id }
+        - subnet: { get_param: oam_subnet_id }
           ip_address: { get_param: db_oam_ip_0 }
 
   db_0_ha_port_0:
@@ -240,14 +240,14 @@ resources:
     properties:
       network: { get_resource: int_private_network }
       fixed_ips: 
-        - subnet_id: { get_resource: int_private_subnet }
+        - subnet: { get_resource: int_private_subnet }
 
   db_1_oam_port_0:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_id }
       fixed_ips: 
-        - subnet_id: { get_param: oam_subnet_id }
+        - subnet: { get_param: oam_subnet_id }
           ip_address: { get_param: db_oam_ip_1 }
 
   db_1_ha_port_0:
@@ -263,7 +263,7 @@ resources:
     properties:
       network: { get_resource: int_private_network }
       fixed_ips: 
-        - subnet_id: { get_resource: int_private_subnet }
+        - subnet: { get_resource: int_private_subnet }
 
 
   db_volume_attachment_0:
@@ -302,7 +302,7 @@ resources:
     properties:
       network: { get_resource: int_private_network }
       fixed_ips: 
-        - subnet_id: { get_resource: int_private_subnet }
+        - subnet: { get_resource: int_private_subnet }
 
   mgmt_0_ctrl_port_0:
     type: OS::Neutron::Port
@@ -345,7 +345,7 @@ resources:
     properties:
       network: { get_resource: int_private_network }
       fixed_ips: 
-        - subnet_id: { get_resource: int_private_subnet }
+        - subnet: { get_resource: int_private_subnet }
   
   svc_resource_group_0:
     type: OS::Heat::ResourceGroup
diff --git a/ice_validator/app_tests/preload_tests/sample_heat/incremental.yaml b/ice_validator/app_tests/preload_tests/sample_heat/incremental.yaml
index 1460149..68da36e 100644
--- a/ice_validator/app_tests/preload_tests/sample_heat/incremental.yaml
+++ b/ice_validator/app_tests/preload_tests/sample_heat/incremental.yaml
@@ -130,7 +130,7 @@ resources:
     properties:
       network: { get_param: int_private_net_id }
       fixed_ips: 
-        - subnet_id: { get_param: int_private_subnet_id }
+        - subnet: { get_param: int_private_subnet_id }
   
   svc_resource_group_1:
     type: OS::Heat::ResourceGroup
diff --git a/ice_validator/app_tests/preload_tests/test_grapi.py b/ice_validator/app_tests/preload_tests/test_grapi.py
index 7f2361f..99498ec 100644
--- a/ice_validator/app_tests/preload_tests/test_grapi.py
+++ b/ice_validator/app_tests/preload_tests/test_grapi.py
@@ -211,8 +211,8 @@ def test_base_parameters(base):
         "vf-module-topology"
     ]["vf-module-parameters"]["param"]
     assert params == [
-        {"name": "svc_image_name", "value": "svc_image"},
-        {"name": "svc_flavor_name", "value": "svc_flavor"},
+        {"name": "db_vol0_id", "value": "VALUE FOR: db_vol0_id"},
+        {"name": "db_vol1_id", "value": "VALUE FOR: db_vol1_id"},
     ]
 
 
diff --git a/ice_validator/app_tests/preload_tests/test_vnfapi.py b/ice_validator/app_tests/preload_tests/test_vnfapi.py
index 16a3140..a49043f 100644
--- a/ice_validator/app_tests/preload_tests/test_vnfapi.py
+++ b/ice_validator/app_tests/preload_tests/test_vnfapi.py
@@ -163,8 +163,14 @@ def test_base_vm_types(base):
 def test_base_parameters(base):
     params = base["input"]["vnf-topology-information"]["vnf-parameters"]
     assert params == [
-        {"vnf-parameter-name": "svc_image_name", "vnf-parameter-value": "svc_image"},
-        {"vnf-parameter-name": "svc_flavor_name", "vnf-parameter-value": "svc_flavor"},
+        {
+            "vnf-parameter-name": "db_vol0_id",
+            "vnf-parameter-value": "VALUE FOR: db_vol0_id",
+        },
+        {
+            "vnf-parameter-name": "db_vol1_id",
+            "vnf-parameter-value": "VALUE FOR: db_vol1_id",
+        },
     ]