aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/test/java/org
diff options
context:
space:
mode:
authoreeginux <henry.xie@est.tech>2019-04-03 14:28:09 +0000
committereeginux <henry.xie@est.tech>2019-04-04 11:41:31 +0100
commit88c47a23b9428188ff5dd0b46941f8856465376b (patch)
tree3f1e028033ad56f398e8154f0be2272012b666b2 /bpmn/MSOCommonBPMN/src/test/java/org
parentb168125f237629b6dd7d73897548f2ee70139ed3 (diff)
PNF WF post instantiation configuration
Add PNF ipv4/v6 address for config Deploy Add Integration test for CreateVcpeResCustService_simplified.bpmn Modify the PnfEventReadyDmaapClient to avoid one more running thread Refactor the so-bpmn-infrastructure-flows test resources Modify the CreateVcpeResCustService_simplified.bpmn Add ConfigurePnfResource.bpmn Add Delegates Issue-ID: SO-1506 Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95 Signed-off-by: eeginux <henry.xie@est.tech>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/test/java/org')
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnfTest.java54
1 files changed, 34 insertions, 20 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnfTest.java
index 1d771c86d5..8e16ce6337 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnfTest.java
@@ -3,45 +3,59 @@ package org.onap.so.client.cds.beans;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import org.junit.Before;
import org.junit.Test;
public class ConfigDeployPropertiesForPnfTest {
+
ConfigDeployPropertiesForPnf configDeployPropertiesForPnf = new ConfigDeployPropertiesForPnf();
- private String serviceInstanceId;
- private String pnfId;
- private String pnfName;
- private String serviceModelUuid;
- private String pnfCustomizationUuid;
+ private static final String TEST_SERVICE_MODEL_UUID = "service-model-uuid";
+ private static final String TEST_PNF_CUSTOMIZATION_UUID = "pnf-customization-uuid";
+ private static final String TEST_PNF_ID = "pnf-id";
+ private static final String TEST_PNF_NAME = "pnf-name";
+ private static final String TEST_PNF_IP_V4_ADDRESS = "1.1.1.1";
+ private static final String TEST_PNF_IP_V6_ADDRESS = "::/128";
+ private static final String TEST_SERVICE_INSTANCE_ID = "service-instance-id";
+
+ @Before
+ public void setUp(){
+ configDeployPropertiesForPnf.setServiceInstanceId(TEST_SERVICE_INSTANCE_ID);
+ configDeployPropertiesForPnf.setServiceModelUuid(TEST_SERVICE_MODEL_UUID);
+ configDeployPropertiesForPnf.setPnfCustomizationUuid(TEST_PNF_CUSTOMIZATION_UUID);
+ configDeployPropertiesForPnf.setPnfId(TEST_PNF_ID);
+ configDeployPropertiesForPnf.setPnfName(TEST_PNF_NAME);
+ configDeployPropertiesForPnf.setPnfIpV4Address(TEST_PNF_IP_V4_ADDRESS);
+ configDeployPropertiesForPnf.setPnfIpV6Address(TEST_PNF_IP_V6_ADDRESS);
+ }
@Test
public final void testConfigDeployPropertiesForPnfTest() {
- configDeployPropertiesForPnf.setServiceInstanceId("service-instance-id");
- configDeployPropertiesForPnf.setServiceModelUuid("service-model-uuid");
- configDeployPropertiesForPnf.setPnfCustomizationUuid("pnf-customization-uuid");
- configDeployPropertiesForPnf.setPnfId("pnf-id");
- configDeployPropertiesForPnf.setPnfName("pnf-name");
assertNotNull(configDeployPropertiesForPnf.getServiceInstanceId());
assertNotNull(configDeployPropertiesForPnf.getServiceModelUuid());
assertNotNull(configDeployPropertiesForPnf.getPnfCustomizationUuid());
assertNotNull(configDeployPropertiesForPnf.getPnfId());
assertNotNull(configDeployPropertiesForPnf.getPnfName());
- assertEquals("service-instance-id", configDeployPropertiesForPnf.getServiceInstanceId());
- assertEquals("service-model-uuid", configDeployPropertiesForPnf.getServiceModelUuid());
- assertEquals("pnf-customization-uuid", configDeployPropertiesForPnf.getPnfCustomizationUuid());
- assertEquals("pnf-id", configDeployPropertiesForPnf.getPnfId());
- assertEquals("pnf-name", configDeployPropertiesForPnf.getPnfName());
+ assertEquals(TEST_SERVICE_INSTANCE_ID, configDeployPropertiesForPnf.getServiceInstanceId());
+ assertEquals(TEST_SERVICE_MODEL_UUID, configDeployPropertiesForPnf.getServiceModelUuid());
+ assertEquals(TEST_PNF_CUSTOMIZATION_UUID, configDeployPropertiesForPnf.getPnfCustomizationUuid());
+ assertEquals(TEST_PNF_ID, configDeployPropertiesForPnf.getPnfId());
+ assertEquals(TEST_PNF_NAME, configDeployPropertiesForPnf.getPnfName());
+ assertEquals(TEST_PNF_IP_V4_ADDRESS, configDeployPropertiesForPnf.getPnfIpV4Address());
+ assertEquals(TEST_PNF_IP_V6_ADDRESS, configDeployPropertiesForPnf.getPnfIpV6Address());
}
@Test
public void testtoString() {
final StringBuilder sb = new StringBuilder("{");
- sb.append("\"service-instance-id\":").append("\"").append(serviceInstanceId).append("\"");
- sb.append(", \"pnf-id\":").append("\"").append(pnfId).append("\"");
- sb.append(", \"pnf-name\":").append("\"").append(pnfName).append("\"");
- sb.append(", \"service-model-uuid\":").append("\"").append(serviceModelUuid).append("\"");
- sb.append(", \"pnf-customization-uuid\":").append("\"").append(pnfCustomizationUuid).append("\"");
+ sb.append("\"service-instance-id\":").append("\"").append(TEST_SERVICE_INSTANCE_ID).append("\"");
+ sb.append(", \"pnf-id\":").append("\"").append(TEST_PNF_ID).append("\"");
+ sb.append(", \"pnf-name\":").append("\"").append(TEST_PNF_NAME).append("\"");
+ sb.append(", \"pnf-ipv4-address\":").append("\"").append(TEST_PNF_IP_V4_ADDRESS).append("\"");
+ sb.append(", \"pnf-ipv6-address\":").append("\"").append(TEST_PNF_IP_V6_ADDRESS).append("\"");
+ sb.append(", \"service-model-uuid\":").append("\"").append(TEST_SERVICE_MODEL_UUID).append("\"");
+ sb.append(", \"pnf-customization-uuid\":").append("\"").append(TEST_PNF_CUSTOMIZATION_UUID).append("\"");
sb.append('}');
String Expexted = sb.toString();
assertEquals(Expexted, configDeployPropertiesForPnf.toString());