Cleanup unit tests
Remove references to systems no longer part of ONAP
Issue-ID: SO-3096
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I31f8975e230b04d58ef3c36f198f1cafa508c5b7
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
index 9b892af..7711608 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/OrchestrationRequestsTest.java
@@ -133,7 +133,6 @@
testResponse.getRequest().setRequestProcessingData(new ArrayList<RequestProcessingData>());
RequestProcessingData e = new RequestProcessingData();
e.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714");
- e.setTag("pincFabricConfigRequest");
List<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
HashMap<String, String> data1 = new HashMap<String, String>();
data1.put("requestAction", "assign");
@@ -210,7 +209,6 @@
testResponse.getRequest().setRequestProcessingData(new ArrayList<RequestProcessingData>());
RequestProcessingData e = new RequestProcessingData();
e.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714");
- e.setTag("pincFabricConfigRequest");
List<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
HashMap<String, String> data1 = new HashMap<String, String>();
data1.put("requestAction", "assign");
@@ -256,7 +254,6 @@
testResponse.getRequest().setRequestProcessingData(new ArrayList<RequestProcessingData>());
RequestProcessingData e = new RequestProcessingData();
e.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714");
- e.setTag("pincFabricConfigRequest");
List<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
HashMap<String, String> data1 = new HashMap<String, String>();
data1.put("requestAction", "assign");
@@ -463,13 +460,11 @@
HashMap<String, String> secondExpectedMap = new HashMap<>();
List<RequestProcessingData> expectedDataList = new ArrayList<>();
entry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca714");
- entry.setTag("pincFabricConfigRequest");
expectedMap.put("requestAction", "assign");
- expectedMap.put("pincFabricId", "testId");
+ expectedMap.put("fabricId", "testId");
expectedList.add(expectedMap);
entry.setDataPairs(expectedList);
secondEntry.setGroupingId("7d2e8c07-4d10-456d-bddc-37abf38ca715");
- secondEntry.setTag("pincFabricConfig");
secondExpectedMap.put("requestAction", "unassign");
secondExpectedList.add(secondExpectedMap);
secondEntry.setDataPairs(secondExpectedList);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/RequestProcessingData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/RequestProcessingData.json
index 79caa33..a84b2db 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/RequestProcessingData.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/RequestProcessingData.json
@@ -4,21 +4,18 @@
"soRequestId": "00032ab7-na18-42e5-965d-8ea592502018",
"groupingId": "7d2e8c07-4d10-456d-bddc-37abf38ca714",
"name": "requestAction",
- "value": "assign",
- "tag": "pincFabricConfigRequest"
+ "value": "assign"
},{
"id": 2,
"soRequestId": "00032ab7-na18-42e5-965d-8ea592502018",
"groupingId": "7d2e8c07-4d10-456d-bddc-37abf38ca714",
- "name": "pincFabricId",
- "value": "testId",
- "tag": "pincFabricConfigRequest"
+ "name": "fabricId",
+ "value": "testId"
},{
"id": 3,
"soRequestId": "00032ab7-na18-42e5-965d-8ea592502018",
"groupingId": "7d2e8c07-4d10-456d-bddc-37abf38ca715",
"name": "requestAction",
- "value": "unassign",
- "tag": "pincFabricConfig"
+ "value": "unassign"
}
]
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingData.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingData.json
index af28007..6ebe552 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingData.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingData.json
@@ -3,6 +3,5 @@
"soRequestId": "00032ab7-na18-42e5-965d-8ea592502018",
"groupingId": "7d2e8c07-4d10-456d-bddc-37abf38ca714",
"name": "requestAction",
- "value": "assign",
- "tag": "pincFabricConfigRequest"
+ "value": "assign"
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingDataArray.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingDataArray.json
index c746020..c3554c8 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingDataArray.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestProcessingDataArray.json
@@ -3,6 +3,5 @@
"soRequestId": "00032ab7-na18-42e5-965d-8ea592502018",
"groupingId": "7d2e8c07-4d10-456d-bddc-37abf38ca714",
"name": "requestAction",
- "value": "assign",
- "tag": "pincFabricConfigRequest"
+ "value": "assign"
}]