summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
63036ab)
Change-Id: I3bc21a2f1eff39341a4eb9b0a06306b27fff2ea2
Issue-ID: NONRTRIC-81
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
package org.oransc.policyagent;
import org.oransc.policyagent.configuration.ApplicationConfig;
package org.oransc.policyagent;
import org.oransc.policyagent.configuration.ApplicationConfig;
public Rics getRics() {
return rics;
}
public Rics getRics() {
return rics;
}
@Bean
public ApplicationConfig getApplicationConfig() {
return new ApplicationConfig();
@Bean
public ApplicationConfig getApplicationConfig() {
return new ApplicationConfig();
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
package org.oransc.policyagent.configuration;
import java.util.Vector;
package org.oransc.policyagent.configuration;
import java.util.Vector;
import org.immutables.gson.Gson;
import org.immutables.value.Value;
import org.immutables.gson.Gson;
import org.immutables.value.Value;
package org.oransc.policyagent.controllers;
import com.google.gson.Gson;
package org.oransc.policyagent.controllers;
import com.google.gson.Gson;
-import org.oransc.policyagent.Beans;
import com.google.gson.GsonBuilder;
import com.google.gson.GsonBuilder;
import java.util.Collection;
import java.util.Vector;
import java.util.Collection;
import java.util.Vector;
+import org.oransc.policyagent.Beans;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicy;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicy;
@RestController
public class PolicyController {
@RestController
public class PolicyController {
- private final Beans beans;
private final ApplicationConfig appConfig;
private final Rics rics;
private final PolicyTypes types;
private final ApplicationConfig appConfig;
private final Rics rics;
private final PolicyTypes types;
@Autowired
PolicyController(Beans beans) {
@Autowired
PolicyController(Beans beans) {
this.appConfig = beans.getApplicationConfig();
this.rics = beans.getRics();
this.types = beans.getPolicyTypes();
this.appConfig = beans.getApplicationConfig();
this.rics = beans.getRics();
this.types = beans.getPolicyTypes();
+ /**
+ * Reads the configured Rics and performs the service discovery. The result is put into the repository.
+ */
public void startup() {
applicationConfig.initialize();
Vector<RicConfig> ricConfigs = applicationConfig.getRicConfigs();
public void startup() {
applicationConfig.initialize();
Vector<RicConfig> ricConfigs = applicationConfig.getRicConfigs();
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
package org.oransc.policyagent.repository;
import org.immutables.gson.Gson;
package org.oransc.policyagent.repository;
import org.immutables.gson.Gson;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.exceptions.ServiceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class PolicyTypes {
public class PolicyTypes {
- private static final Logger logger = LoggerFactory.getLogger(PolicyTypes.class);
-
private Map<String, PolicyType> types = new HashMap<String, PolicyType>();
public PolicyTypes() {
private Map<String, PolicyType> types = new HashMap<String, PolicyType>();
public PolicyTypes() {
* limitations under the License.
* ========================LICENSE_END===================================
*/
* limitations under the License.
* ========================LICENSE_END===================================
*/
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
package org.oransc.policyagent;
import static org.assertj.core.api.Assertions.assertThat;
@Test
public void getPoliciesFilter() throws Exception {
@Test
public void getPoliciesFilter() throws Exception {
- String url = "http://localhost:" + port + "/policies?type=type1";
addPolicy("id1", "type1", "service1");
addPolicy("id2", "type1", "service2");
addPolicy("id3", "type2", "service1");
addPolicy("id1", "type1", "service1");
addPolicy("id2", "type1", "service2");
addPolicy("id3", "type2", "service1");
+ String url = "http://localhost:" + port + "/policies?type=type1";
String rsp = this.restTemplate.getForObject(url, String.class);
System.out.println(rsp);
assertThat(rsp).contains("id1");
String rsp = this.restTemplate.getForObject(url, String.class);
System.out.println(rsp);
assertThat(rsp).contains("id1");