upgrade sdc tosca parse to v1.5.1

update pom.xml to use v1.5.1 for sdc-tosca parse
update Extract file since the DM's change
update the csar file based on new DM
update Test file to reflect the new CSAR file

Change-Id: I90da979ff1cedbdedadacc46386aa5ea0e7b6711
Issue-ID: POLICY-1720
Signed-off-by: liboNet <libo.zhu@intel.com>

diff --git a/plugins/reception-plugins/pom.xml b/plugins/reception-plugins/pom.xml
index 5d2e615..4441d9e 100644 (file)
--- a/plugins/reception-plugins/pom.xml
+++ b/plugins/reception-plugins/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.onap.sdc.sdc-tosca</groupId>
             <artifactId>sdc-tosca</artifactId>
-            <version>1.4.1</version>
+            <version>1.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.onap.sdc.sdc-distribution-client</groupId>

diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java
index 1eac005..fc4ed13 100644 (file)
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java
@@ -59,7 +59,7 @@ public class ExtractFromNode {
     private static final String VIRTUAL_MEM_SIZE_PATH = "virtual_memory#virtual_mem_size";
     private static final String NUM_VIRTUAL_CPU_PATH = "virtual_cpu#num_virtual_cpu";
     private static final String CPU_ARCHITECTURE_PATH = "virtual_cpu#cpu_architecture";
-    private static final String MEMORY_PAGE_SIZE_PATH = "virtual_memory#vdu_memory_requirements#memoryPageSize";
+    private static final String MEMORY_PAGE_SIZE_PATH = "virtual_memory#vdu_mem_requirements#memoryPageSize";
     private static final String NETWORK_INTERFACE_TYPE_PATH =
             "virtual_network_interface_requirements#network_interface_requirements#interfaceType";
     private static final String NETWORK_PCI_PATH =

diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java
index 2d91f83..b5396b9 100644 (file)
--- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java
+++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java
@@ -82,7 +82,7 @@ public class TestPolicyDecoderCsarPdpx {
         assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
         assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
 
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vnf_1\""));
+        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
         assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"basicCapabilities\""));
@@ -111,7 +111,7 @@ public class TestPolicyDecoderCsarPdpx {
         assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
         assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
 
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vnf_1\""));
+        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
         assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
@@ -152,7 +152,7 @@ public class TestPolicyDecoderCsarPdpx {
         assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
         assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
 
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vnf_1\""));
+        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
         assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
@@ -195,13 +195,13 @@ public class TestPolicyDecoderCsarPdpx {
         assertTrue(policy.getConfigBody().contains("\"version\":\"1.0\""));
         assertTrue(policy.getConfigBody().contains("\"policyType\":\"hpa\""));
 
-        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vnf_1\""));
+        assertTrue(policy.getConfigBody().contains("\"id\":\"VDU_vgw_0\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.nodes.nfv.Vdu.Compute\""));
         assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\""));
         assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\""));
         assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\""));
         assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"hugePages\""));
-        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"false\""));
+        assertTrue(policy.getConfigBody().contains("\"mandatory\":\"true\""));
         assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\""));
         assertTrue(policy.getConfigBody().contains("\"hpa-version\":\"v1\""));
         assertTrue(policy.getConfigBody().contains("\"hpa-attribute-key\":\"memoryPageSize\""));

diff --git a/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar b/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar
index 3c3c4a1..eec9836 100644 (file)
Binary files a/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar and b/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar differ

diff --git a/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar b/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar
index a97e76d..4394711 100644 (file)
Binary files a/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar and b/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar differ

diff --git a/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar b/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar
index 29a8ca9..6940a35 100644 (file)
Binary files a/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar and b/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar differ

diff --git a/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar b/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar
index 9f1af62..7e37bd4 100644 (file)
Binary files a/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar and b/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar differ

diff --git a/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar b/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar
index 75f5bda..46b8c41 100644 (file)
Binary files a/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar and b/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar differ