Merge "Merge 'origin/casablanca' into master"

3 files changed, 9 insertions, 10 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
index e0d7581dcf..09ee0cde04 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImpl.java
@@ -994,10 +994,6 @@ public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
 						}
 					}
 				}
-				if (multicloudInputs) {
-                    goldenInputs.put(MsoMulticloudUtils.GENERIC_VNF_ID, genericVnfId);
-                    goldenInputs.put(MsoMulticloudUtils.VF_MODULE_ID, vfModuleId);
-				}
 				LOGGER.debug("Ignoring extra inputs: " + extraInputs);
 			}
 
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
index f958a5b140..1fd3ffc90a 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
@@ -67,8 +67,8 @@ public class MsoVnfMulticloudAdapterImplTest extends BaseRestTestUtils{
     public void createVfModule() throws Exception {
         //expectedException.expect(VnfException.class);
         Map<String, String> stackInputs = new HashMap<>();
-        stackInputs.put("oof_directives", "{oofDIRECTIVES}");
-        stackInputs.put("sdnc_directives", "{sdncDIRECTIVES}");
+        stackInputs.put("oof_directives", "{}");
+        stackInputs.put("sdnc_directives", "{}");
         stackInputs.put("generic_vnf_id", "genVNFID");
         stackInputs.put("vf_module_id", "vfMODULEID");
 
diff --git a/adapters/mso-openstack-adapters/src/test/resources/schema.sql b/adapters/mso-openstack-adapters/src/test/resources/schema.sql
index 72810d6f3c..e9f2a09860 100644
--- a/adapters/mso-openstack-adapters/src/test/resources/schema.sql
+++ b/adapters/mso-openstack-adapters/src/test/resources/schema.sql
@@ -28,6 +28,7 @@ create table `allotted_resource_customization` (
   `min_instances` int(11) default null,
   `max_instances` int(11) default null,
   `ar_model_uuid` varchar(200) not null,
+  `resource_input` varchar(20000) default null,
   `creation_timestamp` datetime not null default current_timestamp,
   primary key (`model_customization_uuid`),
   key `fk_allotted_resource_customization__allotted_resource1_idx` (`ar_model_uuid`),
@@ -138,11 +139,11 @@ create table `network_resource` (
   `model_name` varchar(200) not null,
   `model_invariant_uuid` varchar(200) default null,
   `description` varchar(1200) default null,
-  `heat_template_artifact_uuid` varchar(200) not null,
+  `heat_template_artifact_uuid` varchar(200) null,
   `neutron_network_type` varchar(20) default null,
   `model_version` varchar(20) default null,
   `tosca_node_type` varchar(200) default null,
-  `aic_version_min` varchar(20) not null,
+  `aic_version_min` varchar(20) null,
   `aic_version_max` varchar(20) default null,
   `orchestration_mode` varchar(20) default 'heat',
   `resource_category` varchar(20) default null,
@@ -151,8 +152,7 @@ create table `network_resource` (
   primary key (`model_uuid`),
   key `fk_network_resource__temp_network_heat_template_lookup1_idx` (`model_name`),
   key `fk_network_resource__heat_template1_idx` (`heat_template_artifact_uuid`),
-  constraint `fk_network_resource__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete no action on update cascade,
-  constraint `fk_network_resource__temp_network_heat_template_lookup__mod_nm1` foreign key (`model_name`) references `temp_network_heat_template_lookup` (`network_resource_model_name`) on delete no action on update no action
+  constraint `fk_network_resource__heat_template1` foreign key (`heat_template_artifact_uuid`) references `heat_template` (`artifact_uuid`) on delete no action on update cascade
 ) engine=innodb default charset=latin1;
 
 
@@ -168,6 +168,7 @@ create table `network_resource_customization` (
   `network_scope` varchar(45) default null,
   `creation_timestamp` datetime not null default current_timestamp,
   `network_resource_model_uuid` varchar(200) not null,
+  `resource_input` varchar(20000) default null,
   primary key (`model_customization_uuid`),
   key `fk_network_resource_customization__network_resource1_idx` (`network_resource_model_uuid`),
   constraint `fk_network_resource_customization__network_resource1` foreign key (`network_resource_model_uuid`) references `network_resource` (`model_uuid`) on delete cascade on update cascade
@@ -203,6 +204,7 @@ create table `service` (
   `service_role` varchar(200) default null,
   `environment_context` varchar(200) default null,
   `workload_context` varchar(200) default null,
+  `resource_order` varchar(200) default null,
   primary key (`model_uuid`),
   key `fk_service__tosca_csar1_idx` (`tosca_csar_artifact_uuid`),
   constraint `fk_service__tosca_csar1` foreign key (`tosca_csar_artifact_uuid`) references `tosca_csar` (`artifact_uuid`) on delete cascade on update cascade
@@ -381,6 +383,7 @@ create table `vnf_resource_customization` (
   `creation_timestamp` datetime not null default current_timestamp,
   `vnf_resource_model_uuid` varchar(200) not null,
   `multi_stage_design` varchar(20) default null,
+  `resource_input` varchar(20000) default null,
   primary key (`model_customization_uuid`),
   key `fk_vnf_resource_customization__vnf_resource1_idx` (`vnf_resource_model_uuid`),
   constraint `fk_vnf_resource_customization__vnf_resource1` foreign key (`vnf_resource_model_uuid`) references `vnf_resource` (`model_uuid`) on delete cascade on update cascade