Openstack adapter can't resolve HEAT parameter

only cast to Element if value is of that type
added XmlAccessorType annotations to classes
map of string, object now correctly maps with jaxb
Null comma delimited lists can convert to null as well
Handle null values all types in input parameters map.

Change-Id: Ic46ed31c05b8f8551d39b2267ae731829abfc1f0
Issue-ID: SO-1617
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 257 insertions, 0 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/JAXBMarshallingTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/JAXBMarshallingTest.java
new file mode 100644
index 0000000000..038e88317d
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/JAXBMarshallingTest.java
@@ -0,0 +1,51 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.openstack.mappers;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+import org.junit.Test;
+import org.onap.so.adapters.vnfrest.CreateVfModuleRequest;
+
+
+public class JAXBMarshallingTest {
+
+
+	@Test
+	public void xmlMarshalTest() throws IOException, JAXBException {
+		JAXBContext context = JAXBContext.newInstance(CreateVfModuleRequest.class);
+
+		CreateVfModuleRequest request = (CreateVfModuleRequest) context.createUnmarshaller().unmarshal(Files.newBufferedReader(Paths.get("src/test/resources/createVfModuleRequest-with-params.xml")));
+
+		assertEquals("ubuntu-16-04-cloud-amd64", request.getVfModuleParams().get("vcpe_image_name"));
+		assertEquals("10.2.0.0/24", request.getVfModuleParams().get("cpe_public_net_cidr"));
+		assertEquals("", request.getVfModuleParams().get("workload_context"));
+
+	}
+
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
new file mode 100644
index 0000000000..76ba3695f2
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
@@ -0,0 +1,206 @@
+<createVfModuleRequest>
+	<cloudSiteId>RegionOne</cloudSiteId>
+	<tenantId>09d8566ea45e43aa974cf447ed591d77</tenantId>
+	<vnfId>8daea639-82b9-4da6-aec9-5054f006a82d</vnfId>
+	<vnfName>vcpe_vnf_vcpe_infra_201903101808</vnfName>
+	<vfModuleName>vcpe_vfmodule_vcpeinfra53f27a6285bd_201903101808</vfModuleName>
+	<vfModuleId>1ea78add-a36c-4af4-959f-4c43292b3aac</vfModuleId>
+	<vnfType>demoVCPEInfra/vCPE_infra 53f27a62-85bd 0</vnfType>
+	<vfModuleType>VcpeInfra53f27a6285bd..base_vcpe_infra..module-0</vfModuleType>
+	<vnfVersion>1.0</vnfVersion>
+	<modelCustomizationUuid>76135970-0c64-4b62-a4d0-56606fc040b3</modelCustomizationUuid>
+	<requestType></requestType>
+	<volumeGroupId></volumeGroupId>
+	<volumeGroupStackId></volumeGroupStackId>
+	<baseVfModuleId></baseVfModuleId>
+	<baseVfModuleStackId></baseVfModuleStackId>
+	<skipAAI>true</skipAAI>
+	<backout>false</backout>
+	<failIfExists>true</failIfExists>
+	<vfModuleParams>
+		<entry>
+			<key>vf_module_id</key>
+			<value>1ea78add-a36c-4af4-959f-4c43292b3aac</value>
+		</entry>
+		<entry>
+			<key>cpe_public_subnet_id</key>
+			<value>vcpe_net_cpe_public_subnet_201903101808</value>
+		</entry>
+		<entry>
+			<key>oof_directives</key>
+			<value>{}</value>
+		</entry>
+		<entry>
+			<key>cpe_signal_subnet_id</key>
+			<value>vcpe_net_cpe_signal_subnet_201903101808</value>
+		</entry>
+		<entry>
+			<key>onap_private_net_id</key>
+			<value>oam_network_hkV9</value>
+		</entry>
+		<entry>
+			<key>vnf_name</key>
+			<value>vcpe_vnf_vcpe_infra_201903101808</value>
+		</entry>
+		<entry>
+			<key>key_name</key>
+			<value>vaaa_key</value>
+		</entry>
+		<entry>
+			<key>workload_context</key>
+			<value></value>
+		</entry>
+		<entry>
+			<key>vweb_name_0</key>
+			<value>zdcpe1cpe01web01_201903101808</value>
+		</entry>
+		<entry>
+			<key>vf_module_name</key>
+			<value>vcpe_vfmodule_vcpeinfra53f27a6285bd_201903101808</value>
+		</entry>
+		<entry>
+			<key>vcpe_flavor_name</key>
+			<value>m1.medium</value>
+		</entry>
+		<entry>
+			<key>vdhcp_name_0</key>
+			<value>zdcpe1cpe01dhcp01_201903101808</value>
+		</entry>
+		<entry>
+			<key>vdhcp_private_ip_0</key>
+			<value>10.4.0.1</value>
+		</entry>
+		<entry>
+			<key>install_script_version</key>
+			<value>1.3.0</value>
+		</entry>
+		<entry>
+			<key>vdhcp_private_ip_1</key>
+			<value>10.0.101.1</value>
+		</entry>
+		<entry>
+			<key>vnf_id</key>
+			<value>8daea639-82b9-4da6-aec9-5054f006a82d</value>
+		</entry>
+		<entry>
+			<key>cloud_env</key>
+			<value>openstack</value>
+		</entry>
+		<entry>
+			<key>mr_ip_addr</key>
+			<value>10.12.5.69</value>
+		</entry>
+		<entry>
+			<key>repo_url_artifacts</key>
+			<value>https://nexus.onap.org/content/repositories/releases</value>
+		</entry>
+		<entry>
+			<key>dcae_collector_port</key>
+			<value>8080</value>
+		</entry>
+		<entry>
+			<key>repo_url_blob</key>
+			<value>https://nexus.onap.org/content/sites/raw</value>
+		</entry>
+		<entry>
+			<key>public_net_id</key>
+			<value>971040b2-7059-49dc-b220-4fab50cb2ad4</value>
+		</entry>
+		<entry>
+			<key>onap_private_net_cidr</key>
+			<value>10.0.0.0/16</value>
+		</entry>
+		<entry>
+			<key>cpe_signal_net_cidr</key>
+			<value>10.4.0.0/24</value>
+		</entry>
+		<entry>
+			<key>environment_context</key>
+			<value></value>
+		</entry>
+		<entry>
+			<key>onap_private_subnet_id</key>
+			<value>oam_network_hkV9</value>
+		</entry>
+		<entry>
+			<key>vweb_private_ip_0</key>
+			<value>10.2.0.10</value>
+		</entry>
+		<entry>
+			<key>vaaa_private_ip_1</key>
+			<value>10.0.101.2</value>
+		</entry>
+		<entry>
+			<key>cpe_public_net_id</key>
+			<value>vcpe_net_cpe_public_201903101808</value>
+		</entry>
+		<entry>
+			<key>vweb_private_ip_1</key>
+			<value>10.0.101.40</value>
+		</entry>
+		<entry>
+			<key>mr_ip_port</key>
+			<value>30227</value>
+		</entry>
+		<entry>
+			<key>vaaa_private_ip_0</key>
+			<value>10.4.0.2</value>
+		</entry>
+		<entry>
+			<key>pub_key</key>
+			<value>ssh-rsa
+				AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh</value>
+		</entry>
+		<entry>
+			<key>sdnc_directives</key>
+			<value>{}</value>
+		</entry>
+		<entry>
+			<key>vdns_private_ip_0</key>
+			<value>10.2.0.1</value>
+		</entry>
+		<entry>
+			<key>cpe_signal_net_id</key>
+			<value>vcpe_net_cpe_signal_201903101808</value>
+		</entry>
+		<entry>
+			<key>vdns_private_ip_1</key>
+			<value>10.0.101.3</value>
+		</entry>
+		<entry>
+			<key>demo_artifacts_version</key>
+			<value>1.3.0</value>
+		</entry>
+		<entry>
+			<key>vdns_name_0</key>
+			<value>zdcpe1cpe01dns01_201903101808</value>
+		</entry>
+		<entry>
+			<key>cpe_public_net_cidr</key>
+			<value>10.2.0.0/24</value>
+		</entry>
+		<entry>
+			<key>vaaa_name_0</key>
+			<value>zdcpe1cpe01aaa01_201903101808</value>
+		</entry>
+		<entry>
+			<key>dcae_collector_ip</key>
+			<value>10.0.4.102</value>
+		</entry>
+		<entry>
+			<key>vcpe_image_name</key>
+			<value>ubuntu-16-04-cloud-amd64</value>
+		</entry>
+		<entry>
+			<key>vf_module_index</key>
+			<value>0</value>
+		</entry>
+
+	</vfModuleParams>
+	<msoRequest>
+		<requestId>11c8ec20-a1f8-4aa2-926f-e55d67a30f8b</requestId>
+		<serviceInstanceId>807648fc-c84c-4662-bf23-23c7d8cbe0c8</serviceInstanceId>
+	</msoRequest>
+	<messageId>11c8ec20-a1f8-4aa2-926f-e55d67a30f8b-1552241542248</messageId>
+	<notificationUrl>http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/VNFAResponse/11c8ec20-a1f8-4aa2-926f-e55d67a30f8b-1552241542248</notificationUrl>
+</createVfModuleRequest>
\ No newline at end of file