<description>This artifact contains dependencyManagement declarations of upstream versions.</description>
<properties>
- <cps.version>0.0.1-SNAPSHOT</cps.version>
+ <cps.version>1.0.0</cps.version>
<hibernate-jpa-api.version>1.0.1.Final</hibernate-jpa-api.version>
<jinjava.version>2.5.6</jinjava.version>
<lombok.version>1.18.16</lombok.version>
<packaging>pom</packaging>
<properties>
- <cps.version>0.0.1-SNAPSHOT</cps.version>
+ <cps.version>1.0.0</cps.version>
<java.version>11</java.version>
<minimum-coverage>0.9</minimum-coverage>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spotbugs</artifactId>
- <version>${project.version}</version>
+ <version>${cps.version}</version>
</dependency>
<dependency>
<!-- The SpotBugs Maven plugin uses SLF4J 1.8 beta 2 -->
@Before
public void setup() {
objectMapper = new ObjectMapper();
- template = new Template("getNbr", "ran-network", "sample");
+ template = new Template("getNbr", "ran-network", "sample", "get");
}
@Test
public void testCreateTemplate() throws Exception {
- final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample");
+ final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample", "get");
final String templateJson = objectMapper.writeValueAsString(templateRequest);
Mockito.when(templateBusinessLogic.createTemplate(ArgumentMatchers.any()))
.thenReturn(template);
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
@Component
public class CpsRestClient {
- private static final String NODES_API_PATH = "%s/anchors/%s/nodes?cps-path=%s";
+ private static final String NODES_API_PATH = "/anchors/{anchor}/nodes";
+
+ private static final String QUERY_API_PATH = "/anchors/{anchor}/nodes/query";
@Autowired
private RestTemplate restTemplate;
* @param xpath xpath query
* @return result Response string from CPS
*/
- public String fetchNode(final String anchor, final String xpath) throws CpsClientException {
- final String url = appConfiguration.getXnfProxyUrl();
-
- final String uri = String.format(NODES_API_PATH, url, anchor, xpath);
+ public String fetchNode(final String anchor, final String xpath,
+ final String requestType) throws CpsClientException {
+ final MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
+ queryParams.add("cpsPath", xpath);
+ String uri = buildCpsUrl(NODES_API_PATH, anchor, queryParams);
+ if ("query".equals(requestType)) {
+ uri = buildCpsUrl(QUERY_API_PATH, anchor, queryParams);
+ }
final HttpHeaders headers = new HttpHeaders();
headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
}
}
+ private String buildCpsUrl(final String path, final String anchor,
+ final MultiValueMap<String, String> queryParams) {
+ final String baseUrl = appConfiguration.getXnfProxyUrl();
+
+ return UriComponentsBuilder
+ .fromHttpUrl(baseUrl)
+ .path(path)
+ .queryParams(queryParams)
+ .buildAndExpand(anchor)
+ .toUriString();
+ }
+
}
private String xpathTemplate;
+ private String requestType;
+
}
@NotEmpty(message = "template missing")
private String xpathTemplate;
+ @NotEmpty(message = "request type missing")
+ private String requestType;
+
}
throw new ExecuteException("Anchor not found for the schema");
}
final String xpath = generateXpath(template.getXpathTemplate(), inputParameters);
+
try {
- return cpsRestClient.fetchNode(anchor, xpath);
+ return cpsRestClient.fetchNode(anchor, xpath, template.getRequestType());
} catch (final CpsClientException e) {
throw new ExecuteException(e.getLocalizedMessage());
}
public Template createTemplate(final TemplateRequest templateRequest) {
final Template template = new Template(templateRequest.getTemplateId(),
templateRequest.getModel(),
- templateRequest.getXpathTemplate());
+ templateRequest.getXpathTemplate(), templateRequest.getRequestType());
return templateRepository.save(template);
}
import static org.junit.Assert.assertEquals;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@Rule
public ExpectedException exception = ExpectedException.none();
- @Test
- public void testFetchNode() throws Exception {
- final HttpHeaders responseHeaders = new HttpHeaders();
+ private HttpHeaders responseHeaders;
+ private ResponseEntity<String> response;
+
+ /**
+ * Setup variables before test.
+ *
+ */
+ @Before
+ public void setUp() {
+ responseHeaders = new HttpHeaders();
responseHeaders.setContentType(MediaType.APPLICATION_JSON);
- final ResponseEntity<String> response = new ResponseEntity<>("sample response", responseHeaders,
+ response = new ResponseEntity<>("sample response", responseHeaders,
HttpStatus.OK);
- Mockito.when(restTemplate.exchange(ArgumentMatchers.anyString(),
+ }
+
+ @Test
+ public void testFetchNode() throws Exception {
+ final String uri = "http://localhost:8000/anchors/coverage-area-onap/nodes?cpsPath=sample";
+ Mockito.when(restTemplate.exchange(ArgumentMatchers.eq(uri),
ArgumentMatchers.any(HttpMethod.class),
ArgumentMatchers.any(),
ArgumentMatchers.<Class<String>>any()))
.thenReturn(response);
- assertEquals("sample response", cpsRestClient.fetchNode("coverage-area-onap", "sample"));
+ assertEquals("sample response", cpsRestClient.fetchNode("coverage-area-onap", "sample", "get"));
final ResponseEntity<String> errorResponse = new ResponseEntity<>("sample response",
responseHeaders, HttpStatus.NOT_FOUND);
.thenReturn(errorResponse);
exception.expect(CpsClientException.class);
exception.expectMessage("Response code from CPS other than 200: 404");
- cpsRestClient.fetchNode("coverage-area-onap", "sample");
+ cpsRestClient.fetchNode("coverage-area-onap", "sample", "get");
}
+ @Test
+ public void testQueryApi() throws Exception {
+ final String uri = "http://localhost:8000/anchors/coverage-area-onap/nodes/query?cpsPath=sample";
+ Mockito.when(restTemplate.exchange(ArgumentMatchers.eq(uri),
+ ArgumentMatchers.any(HttpMethod.class),
+ ArgumentMatchers.any(),
+ ArgumentMatchers.<Class<String>>any()))
+ .thenReturn(response);
+ assertEquals("sample response", cpsRestClient.fetchNode("coverage-area-onap", "sample", "query"));
+ }
+
@Test
public void testFetchNodeException() throws Exception {
Mockito.when(restTemplate.exchange(ArgumentMatchers.anyString(),
.thenThrow(new RestClientException("Connection refused"));
exception.expect(CpsClientException.class);
exception.expectMessage("Connection refused");
- cpsRestClient.fetchNode("coverage-area-onap", "sample");
+ cpsRestClient.fetchNode("coverage-area-onap", "sample", "get");
}
}
private Template template;
+ private Template queryTemplate;
+
/**
* Setup variables before test.
*
request = new ExecutionRequest(input);
final String xpathTemplate = "/ran-coverage-area/pLMNIdList[@mcc='310' and @mnc='410']"
+ "/coverage-area[@coverageArea='{{coverageArea}}']";
- template = new Template("getNbr", "ran-network", xpathTemplate);
+ template = new Template("getNbr", "ran-network", xpathTemplate, "get");
+ queryTemplate = new Template("getNbr", "ran-network", xpathTemplate, "query");
}
@Test
final String resultString = "[{\"key\": \"value\"}]";
Mockito.when(cpsRestClient
.fetchNode("ran-network", "/ran-coverage-area/pLMNIdList[@mcc='310' and @mnc='410']"
- + "/coverage-area[@coverageArea='Zone 1']"))
+ + "/coverage-area[@coverageArea='Zone 1']", "get"))
.thenReturn(resultString);
Mockito.when(templateRepository.findById(ArgumentMatchers.any()))
.thenReturn(Optional.of(template));
final String exceptionMessage = "Response from CPS other than 200: 404";
Mockito.when(cpsRestClient
.fetchNode("ran-network", "/ran-coverage-area/pLMNIdList[@mcc='310' and @mnc='410']"
- + "/coverage-area[@coverageArea='Zone 1']"))
+ + "/coverage-area[@coverageArea='Zone 1']", "get"))
.thenThrow(new CpsClientException(exceptionMessage));
Mockito.when(templateRepository.findById(ArgumentMatchers.any()))
.thenReturn(Optional.of(template));
exception.expectMessage(exceptionMessage);
executionBusinessLogic.executeTemplate("ran-network", "getNbr", request);
- final Template template1 = new Template("getNbr", "ran-net", "sample");
+ final Template template1 = new Template("getNbr", "ran-net", "sample", "get");
Mockito.when(templateRepository.findById(ArgumentMatchers.any()))
.thenReturn(Optional.of(template1));
exception.expect(ExecuteException.class);
@Test
public void testExecuteTemplateNoAnchor() {
- final Template template = new Template("getNbr", "ran-net", "sample");
+ final Template template = new Template("getNbr", "ran-net", "sample", "get");
Mockito.when(templateRepository.findById(ArgumentMatchers.any()))
.thenReturn(Optional.of(template));
exception.expect(ExecuteException.class);
executionBusinessLogic.executeTemplate("ran-net", "getNbr", request);
}
+ @Test
+ public void testExecuteTemplateQueryApi() throws Exception {
+ final String resultString = "[{\"key\": \"value\"}]";
+ Mockito.when(cpsRestClient
+ .fetchNode("ran-network", "/ran-coverage-area/pLMNIdList[@mcc='310' and @mnc='410']"
+ + "/coverage-area[@coverageArea='Zone 1']", "query"))
+ .thenReturn(resultString);
+ Mockito.when(templateRepository.findById(ArgumentMatchers.any()))
+ .thenReturn(Optional.of(queryTemplate));
+ assertEquals(resultString,
+ executionBusinessLogic.executeTemplate("ran-network", "getNbr", request));
+
+ }
+
}
@Before
public void setup() {
- template = new Template("getNbr", "ran-network", "sample");
+ template = new Template("getNbr", "ran-network", "sample", "get");
final TemplateKey templateKey = new TemplateKey("getNbr", "ran-network");
}
@Test
public void testCreateTemplate() throws Exception {
- final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample");
+ final TemplateRequest templateRequest = new TemplateRequest("getNbr", "ran-network", "sample", "get");
Mockito.when(templateRepository.save(ArgumentMatchers.any())).thenReturn(template);
assertEquals(template, templateBusinessLogic.createTemplate(templateRequest));
}
Code Review / cps / cps-tbdmt.git / commitdiff