Updated fields on sniro request

Updated setter methods in avpn bonding classes.
Updated fields on sniro request to be idenitier instead of candidate

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

4 files changed, 14 insertions, 14 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
index f0bb6a369c..59fad5cdd6 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/SniroHomingV2IT.java
@@ -84,7 +84,7 @@ public class SniroHomingV2IT extends BaseIntegrationTest{
 		requestContext.setMsoRequestId("testRequestId");
 		RequestParameters params = new RequestParameters();
 		params.setaLaCarte(false);
-		params.setSubscriptionServiceType("iptollfree");
+		params.setSubscriptionServiceType("testSubscriptionServiceType");
 		requestContext.setRequestParameters(params);
 	}
 
@@ -94,10 +94,10 @@ public class SniroHomingV2IT extends BaseIntegrationTest{
 		bondingLink.getServiceProxies().add(setServiceProxy("1", "transport"));
 		ServiceProxy sp2 = setServiceProxy("2", "infrastructure");
 		Candidate requiredCandidate = new Candidate();
-		requiredCandidate.setCandidateType(CandidateType.VNF_ID);
+		requiredCandidate.setIdentifierType(CandidateType.VNF_ID);
 		List<String> c = new ArrayList<String>();
 		c.add("testVnfId");
-		requiredCandidate.setCandidates(c);
+		requiredCandidate.setIdentifiers(c);
 		sp2.addRequiredCandidates(requiredCandidate);
 		bondingLink.getServiceProxies().add(sp2);
 		serviceInstance.getVpnBondingLinks().add(bondingLink);
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1Vpn.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1Vpn.json
index b65203b24d..83ecd6add1 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1Vpn.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest1Vpn.json
@@ -42,13 +42,13 @@
         "modelInvariantId" : "testProxyModelInvariantUuid2"
       },
       "requiredCandidates" : [ {
-        "candidateType" : {
+        "identifierType" : {
           "name" : "vnfId"
         },
-        "candidates" : [ "testVnfId" ]
+        "identifiers" : [ "testVnfId" ]
       } ]
     } ],
-    "requestParameters" : {"subscriptionServiceType":"iptollfree","aLaCarte":false}
+    "requestParameters" : {"subscriptionServiceType":"testSubscriptionServiceType","aLaCarte":false}
   },
   "licenseInfo" : {
     "licenseDemands" : [ ]
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json
index ac460c328a..740a05d1be 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3AR.json
@@ -51,7 +51,7 @@
         "modelInvariantId" : "testAllottedModelInvariantUuid3"
       }
     } ],
-    "requestParameters" : {"subscriptionServiceType":"iptollfree","aLaCarte":false}
+    "requestParameters" : {"subscriptionServiceType":"testSubscriptionServiceType","aLaCarte":false}
   },
   "licenseInfo" : {
     "licenseDemands" : [ ]
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3Vpn.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3Vpn.json
index 6db2153691..c3c5c0771a 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3Vpn.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/SniroHoming/SniroManagerRequest3Vpn.json
@@ -42,10 +42,10 @@
         "modelInvariantId" : "testProxyModelInvariantUuid2"
       },
       "requiredCandidates" : [ {
-        "candidateType" : {
+        "identifierType" : {
           "name" : "vnfId"
         },
-        "candidates" : [ "testVnfId" ]
+        "identifiers" : [ "testVnfId" ]
       } ]
     }, {
       "serviceResourceId" : "testProxyId1",
@@ -66,10 +66,10 @@
         "modelInvariantId" : "testProxyModelInvariantUuid2"
       },
       "requiredCandidates" : [ {
-        "candidateType" : {
+        "identifierType" : {
           "name" : "vnfId"
         },
-        "candidates" : [ "testVnfId" ]
+        "identifiers" : [ "testVnfId" ]
       } ]
     }, {
       "serviceResourceId" : "testProxyId1",
@@ -90,13 +90,13 @@
         "modelInvariantId" : "testProxyModelInvariantUuid2"
       },
       "requiredCandidates" : [ {
-        "candidateType" : {
+        "identifierType" : {
           "name" : "vnfId"
         },
-        "candidates" : [ "testVnfId" ]
+        "identifiers" : [ "testVnfId" ]
       } ]
     } ],
-    "requestParameters" : {"subscriptionServiceType":"iptollfree","aLaCarte":false}
+    "requestParameters" : {"subscriptionServiceType":"testSubscriptionServiceType","aLaCarte":false}
   },
   "licenseInfo" : {
     "licenseDemands" : [ ]