import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import java.net.URL;
import java.util.List;
import java.util.Vector;
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.oransc.policyagent.utils.MockA1ClientFactory;
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
+ MockA1ClientFactory a1ClientFactory;
+
+ @Autowired
+ RepositorySupervision supervision;
+
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
public static class MockApplicationConfig extends ApplicationConfig {
@Override
- public void initialize() {
- URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json");
- loadConfigurationFromFile(url.getFile());
+ public String getLocalConfigurationFilePath() {
+ return ""; // No config file loaded for the test
}
}
*/
@TestConfiguration
static class TestBeanFactory {
+ private final PolicyTypes policyTypes = new PolicyTypes();
@Bean
public ApplicationConfig getApplicationConfig() {
return new MockApplicationConfig();
}
+ @Bean
+ MockA1ClientFactory getA1ClientFactory() {
+ return new MockA1ClientFactory(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);
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");
+
+ getA1Client("ric").putPolicy(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 = getA1Client("ric").getPolicies();
+ assertThat(ricPolicies.size()).isEqualTo(1);
+ Policy ricPolicy = ricPolicies.get("policyId");
+ assertThat(ricPolicy.json()).isEqualTo(policy.json());
+ }
+
+ MockA1Client getA1Client(String ricName) throws ServiceException {
+ return a1ClientFactory.getOrCreateA1Client(ricName);
+ }
+
@Test
public void testGetRic() throws Exception {
+ reset();
+ Ric ric = addRic("ric1");
+ ric.addManagedElement("kista_1");
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", "ric1");
+ this.rics.getRic("ric1").setState(Ric.RicState.IDLE);
this.restTemplate.put(url, json);
private PolicyType addPolicyType(String policyTypeName, String ricName) {
PolicyType type = ImmutablePolicyType.builder() //
.name(policyTypeName) //
+ .schema("{\"title\":\"" + policyTypeName + "\"}") //
.build();
policyTypes.put(type);
return rics.get(ricName);
}
Vector<String> mes = new Vector<>();
- RicConfig conf = ImmutableRicConfig.builder().name(ricName).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;
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);
}
@Test
- public void testGetPolicyTypes() throws Exception {
+ public void testGetPolicySchemas() throws Exception {
reset();
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);
assertThat(rsp).contains("type1");
assertThat(rsp).contains("type2");
+ assertThat(rsp).contains("title");
- List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
+ List<String> info = parseList(rsp, String.class);
assertEquals(2, info.size());
- url = baseUrl() + "/policy_types?ric=ric1";
+ url = baseUrl() + "/policy_schemas?ric=ric1";
rsp = this.restTemplate.getForObject(url, String.class);
assertThat(rsp).contains("type1");
- info = parseList(rsp, PolicyTypeInfo.class);
+ info = parseList(rsp, String.class);
assertEquals(1, info.size());
}
+ @Test
+ public void testGetPolicySchema() throws Exception {
+ reset();
+ addPolicyType("type1", "ric1");
+ addPolicyType("type2", "ric2");
+
+ 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
public void testGetPolicies() throws Exception {
String url = baseUrl() + "/policies";
ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() //
.keepAliveInterval(1) //
.name(name) //
+ .callbackUrl("callbackUrl") //
.build();
String json = gson.toJson(service);
return json;
Code Review / nonrtric.git / blobdiff