aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorliboNet <libo.zhu@intel.com>2019-05-09 08:54:06 +0800
committerJorge Hernandez <jorge.hernandez-herrero@att.com>2019-05-13 16:25:51 +0000
commit07cb87c6cea08b59762c84f31eb08c6c182041aa (patch)
tree4841abf5d5ef987790426c886693f79e016f6876 /plugins
parent603bece101d436332444328a5138aaecfad3d2de (diff)
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>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/reception-plugins/pom.xml2
-rw-r--r--plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/pdpx/ExtractFromNode.java2
-rw-r--r--plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java10
-rw-r--r--plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csarbin46508 -> 78091 bytes
-rw-r--r--plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csarbin47214 -> 93228 bytes
-rw-r--r--plugins/reception-plugins/src/test/resources/hpaPolicySriov.csarbin47201 -> 82560 bytes
-rw-r--r--plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csarbin49224 -> 81316 bytes
-rw-r--r--plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csarbin46374 -> 78364 bytes
8 files changed, 7 insertions, 7 deletions
diff --git a/plugins/reception-plugins/pom.xml b/plugins/reception-plugins/pom.xml
index 5d2e615c..4441d9e2 100644
--- 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 1eac005a..fc4ed13f 100644
--- 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 2d91f837..b5396b90 100644
--- 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 3c3c4a15..eec9836e 100644
--- a/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar
+++ b/plugins/reception-plugins/src/test/resources/hpaPolicyHugePage.csar
Binary files differ
diff --git a/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar b/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar
index a97e76d2..43947110 100644
--- a/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar
+++ b/plugins/reception-plugins/src/test/resources/hpaPolicyPciePassthrough.csar
Binary files differ
diff --git a/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar b/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar
index 29a8ca9b..6940a359 100644
--- a/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar
+++ b/plugins/reception-plugins/src/test/resources/hpaPolicySriov.csar
Binary files 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 9f1af628..7e37bd42 100644
--- a/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar
+++ b/plugins/reception-plugins/src/test/resources/s3p_0_pciVendorId.csar
Binary files 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 75f5bda0..46b8c418 100644
--- a/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar
+++ b/plugins/reception-plugins/src/test/resources/service-TestNs8-csar.csar
Binary files differ