From: John Keeney Date: Thu, 9 Apr 2020 08:09:15 +0000 (+0000) Subject: Merge "Added check of callback URL in service registration" X-Git-Tag: 2.0.0~82 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ee5dde3cccb64e50c02f22a5731ba0134e0d761c;hp=3624fcf9d58fe81cd406653f06f7df5a67942246;p=nonrtric.git Merge "Added check of callback URL in service registration" --- diff --git a/docs/index.rst b/docs/index.rst index b499c095..d28ff498 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -5,8 +5,6 @@ Non-RT RIC ========== -.. Add or remove sections below as appropriate for the platform component. - .. toctree:: :maxdepth: 2 :caption: Contents: @@ -18,7 +16,4 @@ Non-RT RIC ./overview.rst ./release-notes.rst - -* :ref:`genindex` -* :ref:`modindex` * :ref:`search` diff --git a/docs/policy-agent-api.rst b/docs/policy-agent-api.rst index 8a46fc71..2a79b26e 100644 --- a/docs/policy-agent-api.rst +++ b/docs/policy-agent-api.rst @@ -115,7 +115,7 @@ PUT Service created. 400: - Something went wrong with the service registration. + The ServiceRegistrationInfo is not accepted. **Examples:** @@ -243,8 +243,8 @@ DELETE /services/keepalive ~~~~~~~~~~~~~~~~~~~ -POST -++++ +PUT ++++ Heart beat from a service. @@ -268,7 +268,7 @@ POST Call: :: - curl -X POST "http://localhost:8081/services/keepalive?name=existing" + curl -X PUT "http://localhost:8081/services/keepalive?name=existing" Result: 200: :: @@ -277,7 +277,7 @@ POST Call: :: - curl -X POST "http://localhost:8081/services/keepalive?name=nonexistent" + curl -X PUT "http://localhost:8081/services/keepalive?name=nonexistent" Result: 404: :: @@ -741,7 +741,7 @@ PUT Near |nbh| RT |nbsp| RIC or policy type is not found. 423: - Near |nbh| RT |nbsp| RIC is locked. + Near |nbh| RT |nbsp| RIC is not operational. **Examples:** @@ -794,6 +794,9 @@ DELETE 404: Policy is not found. + 423: + Near |nbh| RT |nbsp| RIC is not operational. + **Examples:** Call: :: @@ -904,7 +907,7 @@ GET **Parameters:** - managedElementId: (*Optional*) + managedElementId: (*Required*) The ID of the Managed Element. **Responses:** @@ -962,7 +965,8 @@ GET "policyTypes": [ "string" ], - "ricName": "string" + "ricName": "string", + "state": "string" } ] @@ -989,7 +993,8 @@ GET "Example_QoETarget_1.0.0", "ERIC_QoSNudging_0.2.0" ], - "ricName": "Ric 1" + "ricName": "Ric 1", + "state": "AVAILABLE" }, . . @@ -1001,7 +1006,8 @@ GET "policyTypes": [ "STD_PolicyModelUnconstrained_0.2.0" ], - "ricName": "Ric X" + "ricName": "Ric X", + "state": "UNAVAILABLE" } ] diff --git a/policy-agent/docs/api.yaml b/policy-agent/docs/api.yaml index 306b15a8..f42c3e00 100644 --- a/policy-agent/docs/api.yaml +++ b/policy-agent/docs/api.yaml @@ -581,6 +581,9 @@ definitions: ricName: type: string description: identity of the ric + state: + type: string + description: state info title: RicInfo ServiceRegistrationInfo: type: object diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncJsonHelper.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncJsonHelper.java index 7c669612..0245a153 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncJsonHelper.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncJsonHelper.java @@ -23,6 +23,8 @@ package org.oransc.policyagent.clients; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import java.util.ArrayList; import java.util.List; @@ -61,9 +63,10 @@ class SdncJsonHelper { } public static String createInputJsonString(T params) { - JSONObject inputJson = new JSONObject(); - inputJson.put("input", gson.toJson(params)); - return inputJson.toString(); + JsonElement paramsJson = gson.toJsonTree(params); + JsonObject jsonObj = new JsonObject(); + jsonObj.add("input", paramsJson); + return gson.toJson(jsonObj); } public static Mono getValueFromResponse(String response, String key) { diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java index 09916057..3240cdd1 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java @@ -268,7 +268,7 @@ public class PolicyController { } private Mono assertRicStateIdle(Ric ric) { - if (ric.getState() == Ric.RicState.IDLE) { + if (ric.getState() == Ric.RicState.AVAILABLE) { return Mono.just("OK"); } else { RejectionException e = new RejectionException( diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicInfo.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicInfo.java index 5a635716..c75270e4 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicInfo.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicInfo.java @@ -39,9 +39,13 @@ class RicInfo { @ApiModelProperty(value = "supported policy types") public final Collection policyTypes; - RicInfo(String name, Collection managedElementIds, Collection policyTypes) { + @ApiModelProperty(value = "state info") + public final String state; + + RicInfo(String name, Collection managedElementIds, Collection policyTypes, String state) { this.ricName = name; this.managedElementIds = managedElementIds; this.policyTypes = policyTypes; + this.state = state; } } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java index b7b1c305..1064c6f0 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/controllers/RicRepositoryController.java @@ -97,7 +97,8 @@ public class RicRepositoryController { List result = new ArrayList<>(); for (Ric ric : rics.getRics()) { if (supportingPolicyType == null || ric.isSupportingType(supportingPolicyType)) { - result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames())); + result.add(new RicInfo(ric.name(), ric.getManagedElementIds(), ric.getSupportedPolicyTypeNames(), + ric.getState().toString())); } } diff --git a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java index 0242b90f..77dc980a 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/repository/Ric.java @@ -38,7 +38,7 @@ public class Ric { @Setter private RicConfig ricConfig; - private RicState state = RicState.UNDEFINED; + private RicState state = RicState.UNAVAILABLE; private Map supportedPolicyTypes = new HashMap<>(); @Getter @Setter @@ -144,11 +144,11 @@ public class Ric { /** * The agent view of the Ric may be inconsistent. */ - UNDEFINED, + UNAVAILABLE, /** * The normal state. Policies can be configured. */ - IDLE, + AVAILABLE, /** * The agent is synchronizing the view of the Ric. */ diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSupervision.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSupervision.java index ba050df7..c2dd18ec 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSupervision.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSupervision.java @@ -115,7 +115,7 @@ public class RicSupervision { } private Mono checkRicState(RicData ric) { - if (ric.ric.getState() == RicState.UNDEFINED) { + if (ric.ric.getState() == RicState.UNAVAILABLE) { return startSynchronization(ric) // .onErrorResume(t -> Mono.empty()); } else if (ric.ric.getState() == RicState.SYNCHRONIZING) { diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java index 54b108e7..ae91d4b2 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java @@ -89,7 +89,7 @@ public class RicSynchronizationTask { @Override protected void hookOnError(Throwable throwable) { logger.warn("Synchronization failure for ric: {}, reason: {}", ric.name(), throwable.getMessage()); - ric.setState(RicState.UNDEFINED); + ric.setState(RicState.UNAVAILABLE); } @Override @@ -126,7 +126,7 @@ public class RicSynchronizationTask { private void onSynchronizationComplete(Ric ric) { logger.debug("Synchronization completed for: {}", ric.name()); - ric.setState(RicState.IDLE); + ric.setState(RicState.AVAILABLE); notifyAllServices("Synchronization completed for:" + ric.name()); } diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index 3bc231f6..7015e81a 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -184,7 +184,7 @@ public class ApplicationTest { ric.getLock().lockBlocking(LockType.EXCLUSIVE); ric.getLock().unlockBlocking(); assertThat(ric.getLock().getLockCounter()).isEqualTo(0); - assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE); + assertThat(ric.getState()).isEqualTo(Ric.RicState.AVAILABLE); } } @@ -211,7 +211,7 @@ public class ApplicationTest { @Test public void testSynchronization() throws Exception { - addRic("ric").setState(Ric.RicState.UNDEFINED); + addRic("ric").setState(Ric.RicState.UNAVAILABLE); String ricName = "ric"; Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); @@ -222,7 +222,7 @@ public class ApplicationTest { Policy policy = addPolicy(policyId, "typeName", "service", ricName); // This should be created in the RIC supervision.checkAllRics(); // The created policy should be put in the RIC await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ricName).getState())); - await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic(ricName).getState())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ricName).getState())); Policies ricPolicies = getA1Client(ricName).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); @@ -266,7 +266,7 @@ public class ApplicationTest { String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); final String policyBody = jsonString(); - this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE); restClient().put(url, policyBody).block(); @@ -290,7 +290,7 @@ public class ApplicationTest { url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); this.rics.getRic(ricName).setState(Ric.RicState.SYNCHRONIZING); testErrorCode(restClient().put(url, policyBody), HttpStatus.LOCKED); - this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE); } @Test @@ -724,7 +724,7 @@ public class ApplicationTest { .controllerName("") // .build(); Ric ric = new Ric(conf); - ric.setState(Ric.RicState.IDLE); + ric.setState(Ric.RicState.AVAILABLE); this.rics.put(ric); return ric; } diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientHelper.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientHelper.java index 1855949d..21808567 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientHelper.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientHelper.java @@ -20,9 +20,6 @@ package org.oransc.policyagent.clients; -import com.google.gson.FieldNamingPolicy; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import java.util.Arrays; import java.util.Vector; @@ -38,19 +35,10 @@ import org.oransc.policyagent.repository.Ric; import reactor.core.publisher.Mono; public class A1ClientHelper { - private static Gson gson = new GsonBuilder() // - .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES) // - .create(); private A1ClientHelper() { } - protected static String createInputJsonString(T inputParams) { - JSONObject inputJson = new JSONObject(); - inputJson.put("input", gson.toJson(inputParams)); - return inputJson.toString(); - } - protected static Mono createOutputJsonResponse(String key, String value) { JSONObject paramsJson = new JSONObject(); paramsJson.put(key, value); diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOnapA1ClientTest.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOnapA1ClientTest.java index 20bbf48f..c7f90737 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOnapA1ClientTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOnapA1ClientTest.java @@ -84,7 +84,7 @@ public class SdncOnapA1ClientTest { SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams); List policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID); Mono policyTypeIdsResp = @@ -102,17 +102,17 @@ public class SdncOnapA1ClientTest { SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .build(); - String inputJsonStringGetTypeIds = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetTypeIds = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_1_ID) // .build(); - String inputJsonStringGetPolicyIdsType1 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetPolicyIdsType1 = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_2_ID) // .build(); - String inputJsonStringGetPolicyIdsType2 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetPolicyIdsType2 = SdncJsonHelper.createInputJsonString(inputParams); List policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID); Mono policyTypeIdsResp = @@ -141,7 +141,7 @@ public class SdncOnapA1ClientTest { .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_1_ID) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams); String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_VALID + ", \"statusSchema\": {} }"; Mono policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType); @@ -159,7 +159,7 @@ public class SdncOnapA1ClientTest { .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_1_ID) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams); String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_INVALID + ", \"statusSchema\": {} }"; Mono policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType); @@ -180,7 +180,7 @@ public class SdncOnapA1ClientTest { .policyInstance(POLICY_JSON_VALID) // .properties(new ArrayList()) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams); whenAsyncPostThenReturn(Mono.empty()); @@ -198,7 +198,7 @@ public class SdncOnapA1ClientTest { .policyTypeId(POLICY_TYPE_1_ID) // .policyInstanceId(POLICY_1_ID) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams); whenAsyncPostThenReturn(Mono.empty()); @@ -214,29 +214,29 @@ public class SdncOnapA1ClientTest { SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .build(); - String inputJsonStringGetTypeIds = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetTypeIds = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_1_ID) // .build(); - String inputJsonStringGetPolicyIdsType1 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetPolicyIdsType1 = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_2_ID) // .build(); - String inputJsonStringGetPolicyIdsType2 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringGetPolicyIdsType2 = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_1_ID) // .policyInstanceId(POLICY_1_ID) // .build(); - String inputJsonStringDeletePolicy1 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringDeletePolicy1 = SdncJsonHelper.createInputJsonString(inputParams); inputParams = ImmutableSdncOnapAdapterInput.builder() // .nearRtRicId(RIC_1_URL) // .policyTypeId(POLICY_TYPE_2_ID) // .policyInstanceId(POLICY_2_ID) // .build(); - String inputJsonStringDeletePolicy2 = A1ClientHelper.createInputJsonString(inputParams); + String inputJsonStringDeletePolicy2 = SdncJsonHelper.createInputJsonString(inputParams); List policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID); Mono policyTypeIdsResp = diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java index cba60e79..18ef0979 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java @@ -108,7 +108,7 @@ public class SdncOscA1ClientTest { AdapterRequest expectedParams = ImmutableAdapterRequest.builder() // .nearRtRicUrl(expUrl) // .build(); - String expInput = A1ClientHelper.createInputJsonString(expectedParams); + String expInput = SdncJsonHelper.createInputJsonString(expectedParams); verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); @@ -143,7 +143,7 @@ public class SdncOscA1ClientTest { AdapterRequest expectedParams = ImmutableAdapterRequest.builder() // .nearRtRicUrl(policiesUrl()) // .build(); - String expInput = A1ClientHelper.createInputJsonString(expectedParams); + String expInput = SdncJsonHelper.createInputJsonString(expectedParams); verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); @@ -168,7 +168,7 @@ public class SdncOscA1ClientTest { .nearRtRicUrl(expUrl) // .body(POLICY_JSON_VALID) // .build(); - String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); + String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams); verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); } @@ -192,7 +192,7 @@ public class SdncOscA1ClientTest { .nearRtRicUrl(expUrl) // .body(policyJson) // .build(); - String expRequest = A1ClientHelper.createInputJsonString(expRequestParams); + String expRequest = SdncJsonHelper.createInputJsonString(expRequestParams); verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expRequest, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); StepVerifier.create(returnedMono) @@ -211,7 +211,7 @@ public class SdncOscA1ClientTest { AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() // .nearRtRicUrl(expUrl) // .build(); - String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); + String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams); verify(asyncRestClientMock).postWithAuthHeader(DELETE_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); @@ -225,18 +225,25 @@ public class SdncOscA1ClientTest { String returnedStatus = clientUnderTest.getPolicyStatus(policy).block(); - assertEquals("OK", returnedStatus, "unexpeted status"); + assertEquals("OK", returnedStatus, "unexpected status"); final String expUrl = policiesUrl() + "/" + POLICY_1_ID + "/status"; AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() // .nearRtRicUrl(expUrl) // .build(); - String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); + String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams); verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_STATUS_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); } + @Test + public void testGetVersion() { + whenPostReturnOkResponse(); + A1ProtocolType returnedVersion = clientUnderTest.getProtocolVersion().block(); + assertEquals(A1ProtocolType.SDNC_OSC_STD_V1_1, returnedVersion, ""); + } + private void whenPostReturnOkResponse() { AdapterResponse adapterResponse = ImmutableAdapterResponse.builder() // .body("OK") // diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java index 3f8dd067..0a5b27b6 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java @@ -108,7 +108,7 @@ public class RicSupervisionTest { types.clear(); policies.clear(); rics.clear(); - RIC_1.setState(RicState.UNDEFINED); + RIC_1.setState(RicState.UNAVAILABLE); RIC_1.clearSupportedPolicyTypes(); } @@ -123,7 +123,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndNoChangedPoliciesOrPolicyTypes_thenNoSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); RIC_1.addSupportedPolicyType(POLICY_TYPE_1); rics.put(RIC_1); @@ -144,7 +144,7 @@ public class RicSupervisionTest { @Test public void whenRicUndefined_thenSynchronization() { - RIC_1.setState(RicState.UNDEFINED); + RIC_1.setState(RicState.UNAVAILABLE); rics.put(RIC_1); RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null)); @@ -174,7 +174,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndErrorGettingPolicyIdentities_thenNoSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); RIC_1.addSupportedPolicyType(POLICY_TYPE_1); rics.put(RIC_1); @@ -189,7 +189,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndNotSameAmountOfPolicies_thenSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); rics.put(RIC_1); policies.put(POLICY_1); @@ -211,7 +211,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndSameAmountOfPoliciesButNotSamePolicies_thenSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); rics.put(RIC_1); policies.put(POLICY_1); @@ -233,7 +233,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndErrorGettingPolicyTypes_thenNoSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); RIC_1.addSupportedPolicyType(POLICY_TYPE_1); rics.put(RIC_1); @@ -249,7 +249,7 @@ public class RicSupervisionTest { @Test public void whenRicIdleAndNotSameAmountOfPolicyTypes_thenSynchronization() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); RIC_1.addSupportedPolicyType(POLICY_TYPE_1); rics.put(RIC_1); @@ -277,7 +277,7 @@ public class RicSupervisionTest { .schema("") // .build(); - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); RIC_1.addSupportedPolicyType(POLICY_TYPE_1); RIC_1.addSupportedPolicyType(policyType2); rics.put(RIC_1); diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java index 7360ff48..f6d2adeb 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java @@ -108,7 +108,7 @@ public class RicSynchronizationTaskTest { policyTypes = new PolicyTypes(); policies = new Policies(); services = new Services(); - RIC_1.setState(RicState.UNDEFINED); + RIC_1.setState(RicState.UNAVAILABLE); RIC_1.clearSupportedPolicyTypes(); } @@ -135,7 +135,7 @@ public class RicSynchronizationTaskTest { @Test public void ricIdlePolicyTypeInRepo_thenSynchronizationWithReuseOfTypeFromRepoAndCorrectServiceNotified() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); policyTypes.put(POLICY_TYPE_1); @@ -166,12 +166,12 @@ public class RicSynchronizationTaskTest { assertThat(policyTypes.size()).isEqualTo(1); assertThat(policies.size()).isEqualTo(0); - assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE); + assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE); } @Test public void ricIdlePolicyTypeNotInRepo_thenSynchronizationWithTypeFromRic() throws Exception { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); setUpCreationOfA1Client(); simulateRicWithOnePolicyType(); @@ -189,12 +189,12 @@ public class RicSynchronizationTaskTest { assertThat(policyTypes.size()).isEqualTo(1); assertThat(policyTypes.getType(POLICY_TYPE_1_NAME).schema()).isEqualTo(typeSchema); assertThat(policies.size()).isEqualTo(0); - assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE); + assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE); } @Test public void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); policies.put(POLICY_1); @@ -215,12 +215,12 @@ public class RicSynchronizationTaskTest { assertThat(policyTypes.size()).isEqualTo(0); assertThat(policies.size()).isEqualTo(1); - assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE); + assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE); } @Test public void ricIdleAndErrorDeletingPoliciesFirstTime_thenSynchronizationWithDeletionOfPolicies() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); policies.put(POLICY_1); @@ -241,12 +241,12 @@ public class RicSynchronizationTaskTest { assertThat(policyTypes.size()).isEqualTo(0); assertThat(policies.size()).isEqualTo(0); - assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE); + assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE); } @Test public void ricIdleAndErrorDeletingPoliciesAllTheTime_thenSynchronizationWithFailedRecovery() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); policies.put(POLICY_1); @@ -272,12 +272,12 @@ public class RicSynchronizationTaskTest { assertThat(policyTypes.size()).isEqualTo(0); assertThat(policies.size()).isEqualTo(0); - assertThat(RIC_1.getState()).isEqualTo(RicState.UNDEFINED); + assertThat(RIC_1.getState()).isEqualTo(RicState.UNAVAILABLE); } @Test public void ricIdlePolicyTypeInRepo_thenSynchronizationWithErrorOnServiceNotificationErrorLogged() { - RIC_1.setState(RicState.IDLE); + RIC_1.setState(RicState.AVAILABLE); policyTypes.put(POLICY_TYPE_1);