Changed in config will add and recover Rics

[nonrtric.git] / policy-agent / src / test / java / org / oransc / policyagent / ApplicationTest.java

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 8a6523c..d78155d 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -34,6 +34,7 @@ import java.util.Vector;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.oransc.policyagent.clients.A1Client;
 import org.oransc.policyagent.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.ImmutableRicConfig;
 import org.oransc.policyagent.configuration.RicConfig;
@@ -50,6 +51,7 @@ import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
 import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.utils.MockA1Client;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -83,9 +85,9 @@ public class ApplicationTest {
 
     public static class MockApplicationConfig extends ApplicationConfig {
         @Override
-        public void initialize() {
+        protected String getLocalConfigurationFilePath() {
             URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
-            loadConfigurationFromFile(url.getFile());
+            return url.getFile();
         }
     }
 
@@ -94,20 +96,33 @@ public class ApplicationTest {
      */
     @TestConfiguration
     static class TestBeanFactory {
+        private final Rics rics = new Rics();
+        private final Policies policies = new Policies();
+        private final PolicyTypes policyTypes = new PolicyTypes();
 
         @Bean
         public ApplicationConfig getApplicationConfig() {
             return new MockApplicationConfig();
         }
 
+        @Bean
+        A1Client getA1Client() {
+            return new MockA1Client(this.policyTypes);
+        }
+
+        @Bean
+        public Policies getPolicies() {
+            return this.policies;
+        }
+
+        @Bean
+        public PolicyTypes getPolicyTypes() {
+            return this.policyTypes;
+        }
+
         @Bean
         public Rics getRics() {
-            Rics rics = new Rics();
-            rics.put(new Ric(ImmutableRicConfig.builder().name("kista_1").baseUrl("kista_url")
-                .managedElementIds(new Vector<>()).build()));
-            rics.put(new Ric(ImmutableRicConfig.builder().name("ric1").baseUrl("ric_url")
-                .managedElementIds(new Vector<>()).build()));
-            return rics;
+            return this.rics;
         }
     }
 
@@ -146,8 +161,6 @@ public class ApplicationTest {
         assertThat(rsp).isEqualTo("ric1");
     }
 
-    // managedElmentId -> nodeName
-
     @Test
     public void testPutPolicy() throws Exception {
         putService("service1");
@@ -155,6 +168,7 @@ public class ApplicationTest {
         String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
         String json = "{}";
         addPolicyType("type1", "ric1");
+        this.rics.getRic("ric1").setState(Ric.RicState.IDLE);
 
         this.restTemplate.put(url, json);
 
@@ -234,7 +248,8 @@ public class ApplicationTest {
     public void testDeletePolicy() throws Exception {
         reset();
         String url = baseUrl() + "/policy?instance=id";
-        addPolicy("id", "typeName", "service1", "ric1");
+        Policy policy = addPolicy("id", "typeName", "service1", "ric1");
+        policy.ric().setState(Ric.RicState.IDLE);
         assertThat(policies.size()).isEqualTo(1);
 
         this.restTemplate.delete(url);
@@ -338,6 +353,7 @@ public class ApplicationTest {
         ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() //
             .keepAliveInterval(1) //
             .name(name) //
+            .callbackUrl("callbackUrl") //
             .build();
         String json = gson.toJson(service);
         return json;