package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import com.google.gson.Gson;
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;
import org.oransc.policyagent.controllers.ImmutableServiceRegistrationInfo;
import org.oransc.policyagent.controllers.ImmutableServiceStatus;
-import org.oransc.policyagent.controllers.PolicyTypeInfo;
import org.oransc.policyagent.controllers.ServiceRegistrationInfo;
import org.oransc.policyagent.controllers.ServiceStatus;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.tasks.RepositorySupervision;
+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;
@Autowired
private PolicyTypes policyTypes;
+ @Autowired
+ MockA1Client a1Client;
+
+ @Autowired
+ RepositorySupervision supervision;
+
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
public static class MockApplicationConfig extends ApplicationConfig {
@Override
- public void initialize() {
+ public String getLocalConfigurationFilePath() {
URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
- loadConfigurationFromFile(url.getFile());
+ return url.getFile();
}
}
*/
@TestConfiguration
static class TestBeanFactory {
+ 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 new 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 new Rics();
}
}
@Test
public void testGetRics() throws Exception {
+ reset();
+ addRic("kista_1");
String url = baseUrl() + "/rics";
String rsp = this.restTemplate.getForObject(url, String.class);
System.out.println(rsp);
url = baseUrl() + "/rics?policyType=ANR";
rsp = this.restTemplate.getForObject(url, String.class);
- // TODO this should test that the correct types are retrieved from the RIC
assertThat(rsp).isEqualTo("[]");
}
+ @Test
+ public void testRecovery() throws Exception {
+ reset();
+ Policy policy = addPolicy("policyId", "typeName", "service", "ric"); // This should be created in the RIC
+
+ Policy policy2 = addPolicy("policyId2", "typeName", "service", "ric");
+ a1Client.putPolicy("ric", policy2); // put it in the RIC
+ policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC
+
+ supervision.checkAllRics(); // The created policy should be put in the RIC
+ Policies ricPolicies = a1Client.getPolicies("ric");
+ assertThat(ricPolicies.size()).isEqualTo(1);
+ Policy ricPolicy = ricPolicies.get("policyId");
+ assertThat(ricPolicy.json()).isEqualTo(policy.json());
+ }
+
@Test
public void testGetRic() throws Exception {
+ reset();
String url = baseUrl() + "/ric?managedElementId=kista_1";
String rsp = this.restTemplate.getForObject(url, String.class);
+ System.out.println(rsp);
assertThat(rsp).isEqualTo("ric1");
}
- // managedElmentId -> nodeName
-
@Test
public void testPutPolicy() throws Exception {
putService("service1");
String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
String json = "{}";
- addPolicyType("type1");
+ addPolicyType("type1", "ric1");
+ this.rics.getRic("ric1").setState(Ric.RicState.IDLE);
this.restTemplate.put(url, json);
- Policy policy = policies.get("instance1");
+ Policy policy = policies.getPolicy("instance1");
assertThat(policy).isNotNull();
assertThat(policy.id()).isEqualTo("instance1");
System.out.println(rsp);
}
- private PolicyType addPolicyType(String name) {
+ private PolicyType addPolicyType(String policyTypeName, String ricName) {
PolicyType type = ImmutablePolicyType.builder() //
- .name(name) //
+ .name(policyTypeName) //
+ .schema("{\"title\":\"" + policyTypeName + "\"}") //
.build();
policyTypes.put(type);
+ addRic(ricName).addSupportedPolicyType(type);
return type;
}
- private Ric addRic(String name) {
+ private Ric addRic(String ricName) {
+ if (rics.get(ricName) != null) {
+ return rics.get(ricName);
+ }
Vector<String> mes = new Vector<>();
- RicConfig conf = ImmutableRicConfig.builder().name(name).baseUrl("baseUrl").managedElementIds(mes).build();
+ RicConfig conf = ImmutableRicConfig.builder() //
+ .name(ricName) //
+ .baseUrl(ricName) //
+ .managedElementIds(mes) //
+ .build();
Ric ric = new Ric(conf);
this.rics.put(ric);
return ric;
.json("{}") //
.ownerServiceName(service) //
.ric(rics.getRic(ric)) //
- .type(addPolicyType(typeName)) //
+ .type(addPolicyType(typeName, ric)) //
.lastModified("lastModified").build();
policies.put(p);
return p;
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);
return null;
}
return gson.fromJson(json, new TypeToken<T>() {}.getType());
+
}
@Test
- public void testGetPolicyTypes() throws Exception {
+ public void testGetPolicySchemas() throws Exception {
reset();
- addPolicy("id1", "type1", "service1");
- addPolicy("id2", "type2", "service2");
+ addPolicyType("type1", "ric1");
+ addPolicyType("type2", "ric2");
- String url = baseUrl() + "/policy_types";
+ String url = baseUrl() + "/policy_schemas";
String rsp = this.restTemplate.getForObject(url, String.class);
- System.out.println(rsp);
+ System.out.println("*** " + rsp);
assertThat(rsp).contains("type1");
assertThat(rsp).contains("type2");
+ assertThat(rsp).contains("title");
+
+ List<String> info = parseList(rsp, String.class);
+ assertEquals(2, info.size());
+
+ url = baseUrl() + "/policy_schemas?ric=ric1";
+ rsp = this.restTemplate.getForObject(url, String.class);
+ assertThat(rsp).contains("type1");
+ info = parseList(rsp, String.class);
+ assertEquals(1, info.size());
+ }
+
+ @Test
+ public void testGetPolicySchema() throws Exception {
+ reset();
+ addPolicyType("type1", "ric1");
+ addPolicyType("type2", "ric2");
- List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
- System.out.println(info.size());
+ String url = baseUrl() + "/policy_schema?id=type1";
+ String rsp = this.restTemplate.getForObject(url, String.class);
+ System.out.println(rsp);
+ assertThat(rsp).contains("type1");
+ assertThat(rsp).contains("title");
+ }
+ @Test
+ public void testGetPolicyTypes() throws Exception {
+ reset();
+ addPolicyType("type1", "ric1");
+ addPolicyType("type2", "ric2");
+
+ String url = baseUrl() + "/policy_types";
+ String rsp = this.restTemplate.getForObject(url, String.class);
+ assertThat(rsp).isEqualTo("[\"type2\",\"type1\"]");
+
+ url = baseUrl() + "/policy_types?ric=ric1";
+ rsp = this.restTemplate.getForObject(url, String.class);
+ assertThat(rsp).isEqualTo("[\"type1\"]");
}
@Test
ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() //
.keepAliveInterval(1) //
.name(name) //
+ .callbackUrl("callbackUrl") //
.build();
String json = gson.toJson(service);
return json;
Code Review / nonrtric.git / blobdiff