import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
-import java.net.URL;
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.List;
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;
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
+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;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.web.client.RestTemplate;
-import reactor.core.publisher.Mono;
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@Autowired
private PolicyTypes policyTypes;
+ @Autowired
+ MockA1ClientFactory a1ClientFactory;
+
+ @Autowired
+ RepositorySupervision supervision;
+
+ @Autowired
+ Services services;
+
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());
- }
- }
-
- static class A1ClientMock implements A1Client {
- private final Policies policies;
- private final PolicyTypes policyTypes;
-
- A1ClientMock(Policies policies, PolicyTypes policyTypes) {
- this.policies = policies;
- this.policyTypes = policyTypes;
- }
-
- @Override
- public Mono<Collection<String>> getPolicyTypeIdentities(String nearRtRicUrl) {
- Vector<String> result = new Vector<>();
- for (PolicyType p : this.policyTypes.getAll()) {
- result.add(p.name());
- }
- return Mono.just(result);
- }
-
- @Override
- public Mono<String> getPolicyType(String nearRtRicUrl, String policyTypeId) {
- try {
- return Mono.just(this.policies.get(policyTypeId).json());
- } catch (Exception e) {
- return Mono.error(e);
- }
- }
-
- @Override
- public Mono<String> putPolicy(String nearRtRicUrl, String policyId, String policyString) {
- return Mono.just("OK");
- }
-
- @Override
- public Mono<String> deletePolicy(String nearRtRicUrl, String policyId) {
- return Mono.just("OK");
- }
-
- @Override
- public Mono<Collection<String>> getPolicyIdentities(String nearRtRicUrl) {
- return Mono.empty(); // problem is that a recovery will start
+ public String getLocalConfigurationFilePath() {
+ return ""; // No config file loaded for the test
}
}
*/
@TestConfiguration
static class TestBeanFactory {
- private final Rics rics = new Rics();
- private final Policies policies = new Policies();
private final PolicyTypes policyTypes = new PolicyTypes();
@Bean
}
@Bean
- A1Client getA1Client() {
- return new A1ClientMock(this.policies, this.policyTypes);
+ MockA1ClientFactory getA1ClientFactory() {
+ return new MockA1ClientFactory(this.policyTypes);
}
@Bean
public Policies getPolicies() {
- return this.policies;
+ return new Policies();
}
@Bean
@Bean
public Rics getRics() {
- return this.rics;
+ return new Rics();
}
}
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");
}
String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
String json = "{}";
addPolicyType("type1", "ric1");
- this.rics.getRic("ric1").setState(Ric.RicState.ACTIVE);
+ this.rics.getRic("ric1").setState(Ric.RicState.IDLE);
this.restTemplate.put(url, json);
Vector<String> mes = new Vector<>();
RicConfig conf = ImmutableRicConfig.builder() //
.name(ricName) //
- .baseUrl("baseUrl") //
+ .baseUrl(ricName) //
.managedElementIds(mes) //
.build();
Ric ric = new Ric(conf);
reset();
String url = baseUrl() + "/policy?instance=id";
Policy policy = addPolicy("id", "typeName", "service1", "ric1");
- policy.ric().setState(Ric.RicState.ACTIVE);
+ policy.ric().setState(Ric.RicState.IDLE);
assertThat(policies.size()).isEqualTo(1);
this.restTemplate.delete(url);
assertThat(policies.size()).isEqualTo(0);
}
- private static <T> List<T> parseList(String json, Class<T> clazz) {
- if (null == json) {
- return null;
- }
- return gson.fromJson(json, new TypeToken<T>() {}.getType());
-
- }
-
@Test
public void testGetPolicySchemas() throws Exception {
reset();
assertThat(rsp).contains("type2");
assertThat(rsp).contains("title");
- List<String> info = parseList(rsp, String.class);
+ List<String> info = parseSchemas(rsp);
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);
+ info = parseSchemas(rsp);
assertEquals(1, info.size());
}
ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() //
.keepAliveInterval(1) //
.name(name) //
+ .callbackUrl("callbackUrl") //
.build();
String json = gson.toJson(service);
return json;
@Test
public void testPutAndGetService() throws Exception {
+ // PUT
putService("name");
- String url = baseUrl() + "/service?name=name";
+ // GET
+ String url = baseUrl() + "/services?name=name";
String rsp = this.restTemplate.getForObject(url, String.class);
- ServiceStatus status = gson.fromJson(rsp, ImmutableServiceStatus.class);
+ List<ImmutableServiceStatus> info = parseList(rsp, ImmutableServiceStatus.class);
+ assertThat(info.size() == 1);
+ ServiceStatus status = info.iterator().next();
assertThat(status.keepAliveInterval() == 1);
assertThat(status.name().equals("name"));
+ // GET (all)
url = baseUrl() + "/services";
rsp = this.restTemplate.getForObject(url, String.class);
assertThat(rsp.contains("name"));
System.out.println(rsp);
- url = baseUrl() + "/service/ping";
- this.restTemplate.put(url, "name");
+ // DELETE
+ assertThat(services.size() == 1);
+ url = baseUrl() + "/services?name=name";
+ this.restTemplate.delete(url);
+ assertThat(services.size() == 0);
+ }
+
+ private static <T> List<T> parseList(String jsonString, Class<T> clazz) {
+ List<T> result = new ArrayList<>();
+ JsonArray jsonArr = new JsonParser().parse(jsonString).getAsJsonArray();
+ for (JsonElement jsonElement : jsonArr) {
+ T o = gson.fromJson(jsonElement.toString(), clazz);
+ result.add(o);
+ }
+ return result;
+ }
+
+ private static List<String> parseSchemas(String jsonString) {
+ JsonArray arrayOfSchema = new JsonParser().parse(jsonString).getAsJsonArray();
+ List<String> result = new ArrayList<>();
+ for (JsonElement schemaObject : arrayOfSchema) {
+ result.add(schemaObject.toString());
+ }
+ return result;
}
}
Code Review / nonrtric.git / blobdiff