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=7ad2dc864c22d0c793c2d16776d8cced4ff239cf;hb=6f609c727d66ad20b5b31eae472fcde5e4acd569;hp=4a7adf503974f4b603e40877937d6543b8772309;hpb=b744f6266f838dbf60f37b1c8d5367632f1f0faa;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 4a7adf50..7ad2dc86 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
@@ -355,6 +355,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");
@@ -542,7 +543,7 @@ public class ApplicationTest {
 
         // Keep alive
         url = "/services/keepalive?name=name";
-        ResponseEntity<String> entity = restClient().postForEntity(url, null).block();
+        ResponseEntity<String> entity = restClient().putForEntity(url).block();
         assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
 
         // DELETE service
@@ -552,7 +553,7 @@ 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);
@@ -718,7 +719,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;
     }