X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=0027cca14cf3f3a8b76f8abc7ef7c5a737ca5663;hb=4ebf74691af13ecb46bb13b7ccd7241d637de676;hp=4f0dbb89b7cd539fcaaec4d482027afd9218ed37;hpb=434089cd08ab3b283eb6d2ee034d3d4af9cf570f;p=nonrtric.git 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 4f0dbb89..0027cca1 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); } } @@ -203,6 +203,12 @@ public class ApplicationTest { rsp = restClient().get(url).block(); assertThat(rsp).contains("ric2"); assertThat(rsp).doesNotContain("ric1"); + assertThat(rsp).contains("AVAILABLE"); + + // All RICs + rsp = restClient().get("/rics").block(); + assertThat(rsp).contains("ric2"); + assertThat(rsp).contains("ric1"); // Non existing policy type url = "/rics?policyType=XXXX"; @@ -211,23 +217,38 @@ public class ApplicationTest { @Test public void testSynchronization() throws Exception { - addRic("ric").setState(Ric.RicState.UNDEFINED); - String ricName = "ric"; - Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); - - getA1Client(ricName).putPolicy(policy2); // put it in the RIC + // Two polictypes will be put in the NearRT RICs + PolicyTypes nearRtRicPolicyTypes = new PolicyTypes(); + nearRtRicPolicyTypes.put(createPolicyType("typeName")); + nearRtRicPolicyTypes.put(createPolicyType("typeName2")); + this.a1ClientFactory.setPolicyTypes(nearRtRicPolicyTypes); + + // One type and one instance added to the agent storage + final String ric1Name = "ric1"; + Ric ric1 = addRic(ric1Name); + Policy policy2 = addPolicy("policyId2", "typeName", "service", ric1Name); + Ric ric2 = addRic("ric2"); + + getA1Client(ric1Name).putPolicy(policy2); // put it in the RIC policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC String policyId = "policyId"; - Policy policy = addPolicy(policyId, "typeName", "service", ricName); // This should be created in the RIC + Policy policy = addPolicy(policyId, "typeName", "service", ric1Name); // 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())); - Policies ricPolicies = getA1Client(ricName).getPolicies(); + // Wait until synch is completed + await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ric1Name).getState())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ric1Name).getState())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic("ric2").getState())); + + Policies ricPolicies = getA1Client(ric1Name).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); Policy ricPolicy = ricPolicies.get(policyId); assertThat(ricPolicy.json()).isEqualTo(policy.json()); + + // Both types should be in the agent storage after the synch + assertThat(ric1.getSupportedPolicyTypes().size()).isEqualTo(2); + assertThat(ric2.getSupportedPolicyTypes().size()).isEqualTo(2); } @Test @@ -247,9 +268,9 @@ public class ApplicationTest { private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId) { if (policyTypeName.isEmpty()) { - return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; + return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; } else { - return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + policyTypeName; } } @@ -266,7 +287,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 +311,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 @@ -320,17 +341,17 @@ public class ApplicationTest { // DELETE POLICY this.addPolicy("instance1", "type1", "service1", "ric1"); doReturn(Mono.error(a1Exception)).when(a1Client).deletePolicy(any()); - testErrorCode(restClient().delete("/policy?instance=instance1"), httpStatus, responseBody); + testErrorCode(restClient().delete("/policy?id=instance1"), httpStatus, responseBody); // GET STATUS this.addPolicy("instance1", "type1", "service1", "ric1"); doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any()); - testErrorCode(restClient().get("/policy_status?instance=instance1"), httpStatus, responseBody); + testErrorCode(restClient().get("/policy_status?id=instance1"), httpStatus, responseBody); // Check that empty response body is OK a1Exception = new WebClientResponseException(httpStatus.value(), "", null, null, null, null); doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any()); - testErrorCode(restClient().get("/policy_status?instance=instance1"), httpStatus); + testErrorCode(restClient().get("/policy_status?id=instance1"), httpStatus); } @Test @@ -355,6 +376,7 @@ public class ApplicationTest { this.addRic("ric1"); this.addRic("ricXXX"); this.addPolicy("instance1", "type1", "service1", "ric1"); + this.addPolicy("instance2", "type1", "service1", "ricXXX"); // Try change ric1 -> ricXXX String urlWrongRic = putPolicyUrl("service1", "ricXXX", "type1", "instance1"); @@ -363,7 +385,7 @@ public class ApplicationTest { @Test public void testGetPolicy() throws Exception { - String url = "/policy?instance=id"; + String url = "/policy?id=id"; Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { String rsp = restClient().get(url).block(); @@ -380,7 +402,7 @@ public class ApplicationTest { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); - String url = "/policy?instance=id"; + String url = "/policy?id=id"; ResponseEntity entity = restClient().deleteForEntity(url).block(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -542,7 +564,7 @@ public class ApplicationTest { // Keep alive url = "/services/keepalive?name=name"; - ResponseEntity entity = restClient().postForEntity(url, null).block(); + ResponseEntity entity = restClient().putForEntity(url).block(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); // DELETE service @@ -552,12 +574,14 @@ public class ApplicationTest { assertThat(services.size()).isEqualTo(0); // Keep alive, no registerred service - testErrorCode(restClient().post("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); + testErrorCode(restClient().put("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); // PUT servive with bad payload testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST); testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST); testErrorCode(restClient().put("/service", createServiceJson("name", -123)), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", createServiceJson("name", 0, "missing.portandprotocol.com")), + HttpStatus.BAD_REQUEST); // GET non existing servive testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); @@ -585,12 +609,12 @@ public class ApplicationTest { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); - String url = "/policy_status?instance=id"; + String url = "/policy_status?id=id"; String rsp = restClient().get(url).block(); assertThat(rsp.equals("OK")).isTrue(); // GET non existing policy status - url = "/policy_status?instance=XXX"; + url = "/policy_status?id=XXX"; testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); } @@ -611,7 +635,11 @@ public class ApplicationTest { } private String createServiceJson(String name, long keepAliveIntervalSeconds) { - ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, "callbackUrl"); + return createServiceJson(name, keepAliveIntervalSeconds, "https://examples.javacodegeeks.com/core-java/"); + } + + private String createServiceJson(String name, long keepAliveIntervalSeconds, String url) { + ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, url); String json = gson.toJson(service); return json; @@ -631,7 +659,7 @@ public class ApplicationTest { } private String baseUrl() { - return "http://localhost:" + port; + return "https://localhost:" + port; } private String jsonString() { @@ -688,12 +716,15 @@ public class ApplicationTest { return a1ClientFactory.getOrCreateA1Client(ricName); } - private PolicyType addPolicyType(String policyTypeName, String ricName) { - PolicyType type = ImmutablePolicyType.builder() // + private PolicyType createPolicyType(String policyTypeName) { + return ImmutablePolicyType.builder() // .name(policyTypeName) // .schema("{\"title\":\"" + policyTypeName + "\"}") // .build(); + } + private PolicyType addPolicyType(String policyTypeName, String ricName) { + PolicyType type = createPolicyType(policyTypeName); policyTypes.put(type); addRic(ricName).addSupportedPolicyType(type); return type; @@ -718,7 +749,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; }