diff options
author | 2022-08-03 11:59:43 -0400 | |
---|---|---|
committer | 2022-08-05 16:10:18 -0400 | |
commit | 219b28ed3c3ee23f10d67c9c50583a8bd5a84f3a (patch) | |
tree | e3d5654f7cb1c16d899d652ab25c97992bf635b6 /generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java | |
parent | 2b1dc5b10650ed62f71d4b84ef662b59ed663fc1 (diff) |
Changes to support ODL Sulfur update
Changes to sdnc/northbound to conform to changes in OpenDaylight Sulfur
release. Many of these changes are due to a change in yangtools, which
no longer implements a common ancestor for its builder classes. This broke
a utility method used in jUnit test cases (build()), which meant all
jUnits using that method had to be updated to call each individual
builder's build() method directly.
Issue-ID: CCSDK-1728
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ia82aa3decd82d873120dd643a6a0427928890f99
Diffstat (limited to 'generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java')
-rw-r--r-- | generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java | 126 |
1 files changed, 61 insertions, 65 deletions
diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java index c572ab6f..00224d6a 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/SecurityZoneTopologyOperationRPCTest.java @@ -7,7 +7,6 @@ import static org.onap.sdnc.northbound.GenericResourceApiProvider.APP_NAME; import static org.onap.sdnc.northbound.GenericResourceApiProvider.INVALID_INPUT_ERROR_MESSAGE; import static org.onap.sdnc.northbound.GenericResourceApiProvider.NO_SERVICE_LOGIC_ACTIVE; import static org.onap.sdnc.northbound.GenericResourceApiProvider.NULL_OR_EMPTY_ERROR_PARAM; -import static org.onap.sdnc.northbound.util.MDSALUtil.build; import static org.onap.sdnc.northbound.util.MDSALUtil.exec; import static org.onap.sdnc.northbound.util.MDSALUtil.requestInformation; import static org.onap.sdnc.northbound.util.MDSALUtil.sdncRequestHeader; @@ -62,7 +61,7 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv @Test public void should_fail_when_service_instance_id_not_present() throws Exception { - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput()); + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput().build(); SecurityZoneTopologyOperationOutput output = exec(genericResourceApiProvider::securityZoneTopologyOperation, input, RpcResult::getResult); @@ -76,15 +75,14 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv @Test public void should_fail_when_invalid_service_data() throws Exception { - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput() - .setSdncRequestHeader(build(sdncRequestHeader() + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput() + .setSdncRequestHeader(sdncRequestHeader() .setSvcRequestId("test-svc-request-id") - .setSvcAction(SvcAction.Assign) - )) - .setServiceInformation(build(serviceInformationBuilder() - .setServiceInstanceId("test-service-instance-id") - )) - ); + .setSvcAction(SvcAction.Assign).build() + ) + .setServiceInformation(serviceInformationBuilder() + .setServiceInstanceId("test-service-instance-id").build() + ).build(); SecurityZoneTopologyOperationOutput output = exec(genericResourceApiProvider::securityZoneTopologyOperation, input, RpcResult::getResult); @@ -101,15 +99,14 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv svcClient.mockHasGraph(true); svcClient.mockExecute(new RuntimeException("test exception")); - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput() - .setSdncRequestHeader(build(sdncRequestHeader() + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput() + .setSdncRequestHeader(sdncRequestHeader() .setSvcRequestId("test-svc-request-id") - .setSvcAction(SvcAction.Assign) - )) - .setServiceInformation(build(serviceInformationBuilder() - .setServiceInstanceId("test-service-instance-id") - )) - ); + .setSvcAction(SvcAction.Assign).build() + ) + .setServiceInformation(serviceInformationBuilder() + .setServiceInstanceId("test-service-instance-id").build() + ).build(); persistServiceInDataBroker(input); @@ -126,15 +123,15 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv svcClient.mockHasGraph(false); - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput() - .setSdncRequestHeader(build(sdncRequestHeader() + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput() + .setSdncRequestHeader(sdncRequestHeader() .setSvcRequestId("test-svc-request-id") - .setSvcAction(SvcAction.Assign) - )) - .setServiceInformation(build(serviceInformationBuilder() - .setServiceInstanceId("test-service-instance-id") - )) - ); + .setSvcAction(SvcAction.Assign).build() + ) + .setServiceInformation(serviceInformationBuilder() + .setServiceInstanceId("test-service-instance-id").build() + ).build(); + persistServiceInDataBroker(input); @@ -159,15 +156,14 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv when(spyDataBroker.newWriteOnlyTransaction()).thenReturn(mockWriteTransaction); genericResourceApiProvider.setDataBroker(spyDataBroker); - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput() - .setSdncRequestHeader(build(sdncRequestHeader() + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput() + .setSdncRequestHeader(sdncRequestHeader() .setSvcRequestId("test-svc-request-id") - .setSvcAction(SvcAction.Assign) - )) - .setServiceInformation(build(serviceInformationBuilder() - .setServiceInstanceId("test-service-instance-id") - )) - ); + .setSvcAction(SvcAction.Assign).build() + ) + .setServiceInformation(serviceInformationBuilder() + .setServiceInstanceId("test-service-instance-id").build() + ).build(); persistServiceInDataBroker(input); @@ -187,19 +183,18 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv svcResultProp.set("security-zone-object-path", "securityZoneObjectPath: XYZ"); svcClient.mockExecute(svcResultProp); - SecurityZoneTopologyOperationInput input = build(securityZoneTopologyOperationInput() - .setSdncRequestHeader(build(sdncRequestHeader() + SecurityZoneTopologyOperationInput input = securityZoneTopologyOperationInput() + .setSdncRequestHeader(sdncRequestHeader() .setSvcRequestId("test-svc-request-id") - .setSvcAction(SvcAction.Assign) - )) - .setRequestInformation(build(requestInformation() + .setSvcAction(SvcAction.Assign).build() + ) + .setRequestInformation(requestInformation() .setRequestId("test-request-id") - .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance) - )) - .setServiceInformation(build(serviceInformationBuilder() - .setServiceInstanceId("test-service-instance-id") - )) - ); + .setRequestAction(RequestInformation.RequestAction.CreateServiceInstance).build() + ) + .setServiceInformation(serviceInformationBuilder() + .setServiceInstanceId("test-service-instance-id").build() + ).build(); Service service = persistServiceInDataBroker(input); @@ -222,20 +217,20 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv private Service persistServiceInDataBroker(SecurityZoneTopologyOperationInput input) throws Exception { - Service service = build(service() + Service service = service() .setServiceInstanceId(input.getServiceInformation().getServiceInstanceId()) - .setServiceData(build(serviceData() - .setServiceLevelOperStatus(build(serviceLevelOperStatus() + .setServiceData(serviceData() + .setServiceLevelOperStatus(serviceLevelOperStatus() .setOrderStatus(OrderStatus.Created) .setModifyTimestamp(Instant.now().toString()) .setLastSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()) .setLastRpcAction(LastRpcAction.Activate) .setLastOrderStatus(LastOrderStatus.PendingAssignment) .setLastAction(LastAction.ActivateNetworkInstance) - .setCreateTimestamp(Instant.now().toString()) - )) - )) - ); + .setCreateTimestamp(Instant.now().toString()).build() + ).build() + ).build(); + db.write(true, service, LogicalDatastoreType.CONFIGURATION); return service; } @@ -243,18 +238,18 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv private SecurityZoneTopologyOperationOutput createExpectedOutput(PropBuilder propBuilder, SecurityZoneTopologyOperationInput input) { - return build(securityZoneTopologyOperationOutput() - .setSecurityZoneResponseInformation(build(securityZoneResponseInformation() - .setObjectPath(propBuilder.get("security-zone-object-path")))) + return securityZoneTopologyOperationOutput() + .setSecurityZoneResponseInformation(securityZoneResponseInformation() + .setObjectPath(propBuilder.get("security-zone-object-path")).build() + ) .setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId()) .setResponseCode(propBuilder.get(svcClient.errorCode)) .setAckFinalIndicator(propBuilder.get(svcClient.ackFinal)) .setResponseMessage(propBuilder.get(svcClient.errorMessage)) - .setServiceResponseInformation(build(serviceResponseInformation() + .setServiceResponseInformation(serviceResponseInformation() .setInstanceId(input.getServiceInformation().getServiceInstanceId()) - .setObjectPath(propBuilder.get(svcClient.serviceObjectPath)) - )) - ); + .setObjectPath(propBuilder.get(svcClient.serviceObjectPath)).build() + ).build(); } private Service createExpectedService( @@ -262,12 +257,13 @@ public class SecurityZoneTopologyOperationRPCTest extends GenericResourceApiProv ServiceInformation expectedServiceInformation = expectedInput.getServiceInformation(); - return build(service() - .setServiceInstanceId(expectedServiceInformation.getServiceInstanceId()) - .setServiceData(build(serviceData())) - .setServiceData(expectedServiceData) - .setServiceStatus(build(serviceStatus())) - ); + return service() + .setServiceInstanceId(expectedServiceInformation.getServiceInstanceId()) + .setServiceData(serviceData().build() + ) + .setServiceData(expectedServiceData) + .setServiceStatus(serviceStatus().build() + ).build(); } } |