From 69197a8abc78ee825d38908cd46690b3c150caa1 Mon Sep 17 00:00:00 2001 From: romaingimbert Date: Thu, 24 Jan 2019 11:01:03 +0100 Subject: hub resource format date -fix code -add listener for testing -add karate test Change-Id: Ife2d7812c77316b75c55e86056f59d838e117069 Issue-ID: EXTAPI-180 Signed-off-by: romaingimbert --- .../onap/nbi/api/listener/ListenerResource.java | 112 +++++++++ .../servicecatalog/ToscaInfosProcessorTest.java | 273 +++++++++++++++++++++ .../resources/karatetest/data/serviceOrder.json | 59 +++++ .../karatetest/features/03--Subscriber.feature | 47 +++- 4 files changed, 490 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/onap/nbi/api/listener/ListenerResource.java create mode 100644 src/test/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessorTest.java (limited to 'src/test') diff --git a/src/test/java/org/onap/nbi/api/listener/ListenerResource.java b/src/test/java/org/onap/nbi/api/listener/ListenerResource.java new file mode 100644 index 0000000..aa9efac --- /dev/null +++ b/src/test/java/org/onap/nbi/api/listener/ListenerResource.java @@ -0,0 +1,112 @@ +/** + * Copyright (c) 2019 Orange + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package org.onap.nbi.api.listener; + +import com.fasterxml.jackson.databind.JsonNode; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.lang3.StringUtils; +import org.onap.nbi.commons.ResourceManagement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.MultiValueMap; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +@RestController +@RequestMapping("/test/listener") +public class ListenerResource extends ResourceManagement { + + Logger logger = LoggerFactory.getLogger(ListenerResource.class); + + Map events = new HashMap<>(); + + /* + listener resource test for hub resource + */ + @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity postListener(@RequestBody JsonNode event) { + if (logger.isDebugEnabled()) { + logger.debug("POST event from nbi : {}", event.toString()); + } + String eventId = event.get("eventId").asText(); + events.put(eventId, event); + + URI location = ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(eventId) + .toUri(); + + return ResponseEntity.created(location).body(event); + } + + + @GetMapping(value = "", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity> findEvents(@RequestParam MultiValueMap params) { + Collection values = new ArrayList<>(); + String serviceOrderId = params.getFirst("serviceOrderId"); + if(StringUtils.isNotEmpty(serviceOrderId)) { + for (JsonNode jsonNode : events.values()) { + String id = jsonNode.get("event").get("id").asText(); + if(id.equals(serviceOrderId)) { + values.add(jsonNode); + } + } + if(!values.isEmpty()) { + return ResponseEntity.ok(values); + } else { + return ResponseEntity.notFound().build(); + } + } else { + values=events.values(); + } + return ResponseEntity.ok(values); + } + + @GetMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity getEvent(@PathVariable String eventId) { + + return ResponseEntity.ok(events.get(eventId)); + + } + + @DeleteMapping(value = "/{eventId}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity deleteEvent(@PathVariable String eventId) { + + events.remove(eventId); + return ResponseEntity.noContent().build(); + + } + + @DeleteMapping(produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity deleteEvents() { + + events.clear(); + return ResponseEntity.noContent().build(); + + } + +} diff --git a/src/test/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessorTest.java b/src/test/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessorTest.java new file mode 100644 index 0000000..3a770ae --- /dev/null +++ b/src/test/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessorTest.java @@ -0,0 +1,273 @@ +/** + * Copyright (c) 2018 Orange + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on + * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + */ +package org.onap.nbi.apis.servicecatalog; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNull; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; + +import org.assertj.core.api.AbstractBooleanAssert; +import org.junit.Test; +import org.onap.nbi.exceptions.TechnicalException; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; + + +public class ToscaInfosProcessorTest { + + final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); // jackson databind + + ToscaInfosProcessor toscaInfosProcessor = new ToscaInfosProcessor(); + + + private LinkedHashMap parseToscaFile(String fileName) { + + File toscaFile = new File(fileName); + if (!toscaFile.exists()) { + throw new TechnicalException("unable to find file : " + fileName); + } + try { + return (LinkedHashMap) mapper.readValue(toscaFile, Object.class); + } catch (IOException e) { + throw new TechnicalException("Unable to parse tosca file : " + fileName); + + } catch (NullPointerException e) { + throw new TechnicalException("unable to find tosca file : " + fileName); + } + } + + + @Test + public void buildResponseWithToscaInfos() { + + ClassLoader classLoader = getClass().getClassLoader(); + File file = new File(classLoader.getResource("toscafile/service-TestNetwork-template.yml").getFile()); + List resources = new ArrayList<>(); + LinkedHashMap resource1 = new LinkedHashMap(); + resource1.put("id", "e2b12ac6-cbb6-4517-9c58-b846d1f68caf"); + resources.add(resource1); + LinkedHashMap toscaFile = parseToscaFile(file.getPath()); + LinkedHashMap response = new LinkedHashMap(); + response.put("resourceSpecification", resources); + toscaInfosProcessor.buildResponseWithToscaInfos((LinkedHashMap) toscaFile.get("topology_template"), response); + + resources = (List) response.get("resourceSpecification"); + assertNull(resources.get(0).get("modelCustomizationId")); + assertNull(resources.get(0).get("modelCustomizationName")); + + } + + @Test + public void buildResponseWithSdcToscaParser() { + + ClassLoader classLoader = getClass().getClassLoader(); + Path path = new File(classLoader.getResource("toscafile/service-Sdwanvpninfraservice-csar.csar").getFile()).toPath().toAbsolutePath(); + List resources = new ArrayList<>(); + LinkedHashMap resource1 = new LinkedHashMap(); + resource1.put("id", "7baa7742-3a13-4288-8330-868015adc340"); + resources.add(resource1); + LinkedHashMap resource2 = new LinkedHashMap(); + resource2.put("id", "81b9430b-8abe-45d6-8bf9-f41a8f5c735f"); + resources.add(resource2); + LinkedHashMap response = new LinkedHashMap(); + response.put("resourceSpecification", resources); + + try { + toscaInfosProcessor.buildResponseWithSdcToscaParser(path, response); + } + catch(SdcToscaParserException e) { + throw new TechnicalException("unable to build response from tosca csar using sdc-parser : " + path.toString()+" "+e.getMessage()); + } + resources = (List) response.get("resourceSpecification"); + List serviceSpecCharacteristic = new ArrayList<>(); + serviceSpecCharacteristic = (List) response.get("serviceSpecCharacteristic"); + assertThat(serviceSpecCharacteristic.get(0).get("name")).isEqualTo("sdwanconnectivity0_topology"); + assertThat(serviceSpecCharacteristic.get(1).get("valueType")).isEqualTo("string"); + assertThat(serviceSpecCharacteristic.get(0).get("required")).isEqualTo(true); + assertThat(serviceSpecCharacteristic.get(1).get("name")).isEqualTo("sdwanconnectivity0_name"); + assertThat(serviceSpecCharacteristic.get(1).get("valueType")).isEqualTo("string"); + assertThat(serviceSpecCharacteristic.get(1).get("required")).isEqualTo(true); + assertThat(resources.get(0).get("modelCustomizationId")).isEqualTo("94ec574b-2306-4cbd-8214-09662b040f73"); + assertThat(resources.get(1).get("modelCustomizationId")).isEqualTo("a7baba5d-6ac3-42b5-b47d-070841303ab1"); + + } + + @Test + public void buildResponseWithSdcToscaParserWithDefaultInputs() { + + ClassLoader classLoader = getClass().getClassLoader(); + Path path = new File(classLoader.getResource("toscafile/service-Sotnvpninfraservice-csar.csar").getFile()).toPath().toAbsolutePath(); + List resources = new ArrayList<>(); + LinkedHashMap resource1 = new LinkedHashMap(); + resource1.put("id", "218df3c3-50dd-4c26-9e36-4771387bb771"); + resources.add(resource1); + LinkedHashMap resource2 = new LinkedHashMap(); + resource2.put("id", "81b9430b-8abe-45d6-8bf9-f41a8f5c735f"); + resources.add(resource2); + LinkedHashMap response = new LinkedHashMap(); + response.put("resourceSpecification", resources); + + try { + toscaInfosProcessor.buildResponseWithSdcToscaParser(path, response); + } + catch(SdcToscaParserException e) { + throw new TechnicalException("unable to build response from tosca csar using sdc-parser : " + path.toString()+" "+e.getMessage()); + } + resources = (List) response.get("resourceSpecification"); + List serviceSpecCharacteristic = new ArrayList<>(); + serviceSpecCharacteristic = (List) response.get("serviceSpecCharacteristic"); + assertThat(resources.get(0).get("modelCustomizationId")).isEqualTo("b44071c8-04fd-4d6b-b6af-772cbfaa1129"); + assertThat(resources.get(1).get("modelCustomizationId")).isEqualTo("c3612284-6c67-4d8c-8b41-b699cc90e76d"); + assertThat(serviceSpecCharacteristic.get(12).get("serviceSpecCharacteristicValue")).isNull(); + assertThat(serviceSpecCharacteristic.get(13).get("serviceSpecCharacteristicValue")).isNotNull(); + } + + @Test + public void buildResponseWithSdcToscaParserwithMetaDataMisMatch() { + + ClassLoader classLoader = getClass().getClassLoader(); + Path path = new File(classLoader.getResource("toscafile/service-Sdwanvpninfraservice-csar.csar").getFile()).toPath().toAbsolutePath(); + List resources = new ArrayList<>(); + LinkedHashMap resource1 = new LinkedHashMap(); + resource1.put("id", "some bad resource id no in TOSCA CSAR"); + resources.add(resource1); + LinkedHashMap resource2 = new LinkedHashMap(); + resource2.put("id", "some bad resource id no in TOSCA CSAR"); + resources.add(resource2); + LinkedHashMap response = new LinkedHashMap(); + response.put("resourceSpecification", resources); + + try { + toscaInfosProcessor.buildResponseWithSdcToscaParser(path, response); + } + catch(SdcToscaParserException e) { + throw new TechnicalException("unable to build response from tosca csar using sdc-parser : " + path.toString()+" "+e.getMessage()); + } + resources = (List) response.get("resourceSpecification"); + List serviceSpecCharacteristic = new ArrayList<>(); + serviceSpecCharacteristic = (List) response.get("serviceSpecCharacteristic"); + assertThat(serviceSpecCharacteristic.get(0).get("name")).isEqualTo("sdwanconnectivity0_topology"); + assertThat(serviceSpecCharacteristic.get(1).get("valueType")).isEqualTo("string"); + assertThat(serviceSpecCharacteristic.get(0).get("required")).isEqualTo(true); + assertThat(serviceSpecCharacteristic.get(1).get("name")).isEqualTo("sdwanconnectivity0_name"); + assertThat(serviceSpecCharacteristic.get(1).get("valueType")).isEqualTo("string"); + assertThat(serviceSpecCharacteristic.get(1).get("required")).isEqualTo(true); + // Check that resources cannot be found in the TOSCA template + assertThat(resources.get(0).get("modelCustomizationId")).isNull(); + assertThat(resources.get(1).get("modelCustomizationId")).isNull(); + + } + @Test + public void buildResponseWithToscaInfosOk() { + + ClassLoader classLoader = getClass().getClassLoader(); + File file = new File(classLoader.getResource("toscafile/service-VfwService2vfBased-template.yml").getFile()); + List resources = new ArrayList<>(); + LinkedHashMap resource1 = new LinkedHashMap(); + resource1.put("id", "e2b12ac6-cbb6-4517-9c58-b846d1f68caf"); + resources.add(resource1); + LinkedHashMap toscaFile = parseToscaFile(file.getPath()); + LinkedHashMap response = new LinkedHashMap(); + response.put("resourceSpecification", resources); + toscaInfosProcessor.buildResponseWithToscaInfos((LinkedHashMap) toscaFile.get("topology_template"), response); + + ArrayList toscaInfos = (ArrayList) response.get("serviceSpecCharacteristic"); + assertThat(toscaInfos.size()).isEqualTo(4); + + for (Object toscaInfo : toscaInfos) { + LinkedHashMap info = (LinkedHashMap) toscaInfo; + if (((String) info.get("name")).equalsIgnoreCase("fortigate_image_url")) { + assertThat(info.get("name")).isEqualTo("fortigate_image_url"); + assertThat(info.get("description")).isNull(); + assertThat(info.get("valueType")).isEqualTo("string"); + assertThat(info.get("@type")).isEqualTo("ONAPserviceCharacteristic"); + assertThat(info.get("required")).isEqualTo(false); + assertThat(info.get("status")).isNull(); + assertThat(((ArrayList) info.get("serviceSpecCharacteristicValue")).size()).isEqualTo(0); + + } + + if (((String) info.get("name")).equalsIgnoreCase("flavor")) { + assertThat(info.get("name")).isEqualTo("flavor"); + assertThat(info.get("description")).isNull(); + assertThat(info.get("valueType")).isEqualTo("string"); + assertThat(info.get("@type")).isEqualTo("ONAPserviceCharacteristic"); + assertThat(info.get("required")).isNull(); + assertThat(info.get("status")).isNull(); + assertThat(((ArrayList) info.get("serviceSpecCharacteristicValue")).size()).isEqualTo(0); + + } + + if (((String) info.get("name")).equalsIgnoreCase("external_network_name")) { + assertThat(info.get("name")).isEqualTo("external_network_name"); + assertThat(info.get("description")).isNull(); + assertThat(info.get("valueType")).isEqualTo("string"); + assertThat(info.get("@type")).isEqualTo("ONAPserviceCharacteristic"); + assertThat(info.get("required")).isNull(); + assertThat(info.get("status")).isEqualTo("inactive"); + ; + assertThat(((ArrayList) info.get("serviceSpecCharacteristicValue")).size()).isEqualTo(0); + + } + + if (((String) info.get("name")).equalsIgnoreCase("cpus")) { + assertThat(info.get("name")).isEqualTo("cpus"); + assertThat(info.get("description")).isEqualTo("Number of CPUs for the server."); + assertThat(info.get("valueType")).isEqualTo("integer"); + assertThat(info.get("@type")).isEqualTo("ONAPserviceCharacteristic"); + assertThat(info.get("required")).isNull(); + assertThat(info.get("status")).isNull(); + ; + assertThat(((ArrayList) info.get("serviceSpecCharacteristicValue")).size()).isEqualTo(4); + ArrayList serviceSpecCharacteristicValues = (ArrayList) info.get("serviceSpecCharacteristicValue"); + + for (Object serviceSpecCharacteristicValue : serviceSpecCharacteristicValues) { + LinkedHashMap serviceSpecValue = (LinkedHashMap) serviceSpecCharacteristicValue; + if (((String) serviceSpecValue.get("value")).equalsIgnoreCase("1")) { + assertThat(serviceSpecValue.get("isDefault")).isEqualTo(false); + assertThat(serviceSpecValue.get("value")).isEqualTo("1"); + assertThat(serviceSpecValue.get("valueType")).isEqualTo("integer"); + } + if (((String) serviceSpecValue.get("value")).equalsIgnoreCase("2")) { + assertThat(serviceSpecValue.get("isDefault")).isEqualTo(true); + assertThat(serviceSpecValue.get("value")).isEqualTo("2"); + assertThat(serviceSpecValue.get("valueType")).isEqualTo("integer"); + } + if (((String) serviceSpecValue.get("value")).equalsIgnoreCase("3")) { + assertThat(serviceSpecValue.get("isDefault")).isEqualTo(false); + assertThat(serviceSpecValue.get("value")).isEqualTo("3"); + assertThat(serviceSpecValue.get("valueType")).isEqualTo("integer"); + } + if (((String) serviceSpecValue.get("value")).equalsIgnoreCase("4")) { + assertThat(serviceSpecValue.get("isDefault")).isEqualTo(false); + assertThat(serviceSpecValue.get("value")).isEqualTo("4"); + assertThat(serviceSpecValue.get("valueType")).isEqualTo("integer"); + } + + } + + + } + + } + + + } +} \ No newline at end of file diff --git a/src/test/resources/karatetest/data/serviceOrder.json b/src/test/resources/karatetest/data/serviceOrder.json index 89cc6e8..7ec577e 100644 --- a/src/test/resources/karatetest/data/serviceOrder.json +++ b/src/test/resources/karatetest/data/serviceOrder.json @@ -1022,5 +1022,64 @@ ] } ] + }, + { + "state": "acknowledged", + "externalId": "extid2", + "priority": "1", + "description": "toto", + "category": "Consumer", + "requestedStartDate": "2019-01-23T12:34:56.123456789Z", + "requestedCompletionDate": "2019-01-23T12:34:56.123456789Z", + "@baseType": "toto", + "completionDateTime": "2019-01-23T12:34:56.123456789Z", + "expectedCompletionDate": "2019-01-23T12:34:56.123456789Z", + "@schemaLocation": "/tutu", + "orderRelationship": [ + { + "id": "test", + "href": "test", + "referredType": "test", + "type": "test" + } + ], + "relatedParty": [ + { + "id": "6490", + "role": "ONAPcustomer", + "referredType": "individual", + "name": "Jean Pontus" + } + ], + "orderItem": [ + { + "id": "A", + "action": "add", + "state": "active", + "service": { + "state": "active", + "serviceSpecification": { + "id": "1e3feeb0-8e36-46c6-862c-236d9c626439" + } + } + }, + { + "id": "B", + "action": "add", + "state": "active", + "service": { + "state": "active", + "serviceSpecification": { + "id": "1e3feeb0-8e36-46c6-862c-236d9c626439" + } + }, + "orderItemRelationship": [ + { + "id": "A", + "type": "reliesOn" + } + ] + } + ] } ] diff --git a/src/test/resources/karatetest/features/03--Subscriber.feature b/src/test/resources/karatetest/features/03--Subscriber.feature index 851ac73..3a41c34 100644 --- a/src/test/resources/karatetest/features/03--Subscriber.feature +++ b/src/test/resources/karatetest/features/03--Subscriber.feature @@ -8,7 +8,16 @@ Background: * def Context = Java.type('org.onap.nbi.test.Context'); * call Context.startServers(); * def data = read('../data/subscriber.json') - +* def serviceOrderData = read('../data/serviceOrder.json') +* def checkDateFormat = +""" +function(s) { + var SimpleDateFormat = Java.type("java.text.SimpleDateFormat"); + var sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + return sdf.parse(s); +} +""" + Scenario: testFindWhenNoSubscriber Given path 'hub' When method get @@ -64,3 +73,39 @@ And def Id = $[0].id Given path 'hub',Id When method delete Then status 204 + +Scenario: testSubscriberWithTestListener +* def listenerUrl = nbiBaseUrl + "/test/listener" +Given path 'test/listener' +When method delete +Then status 204 +Given path 'hub' +And request { id : 'id', callback : '#(listenerUrl)' , query : 'eventType = ServiceOrderCreationNotification' } +When method post +Then status 201 +Given path 'hub' +When method get +And def hubId = $[0].id +Given path 'serviceOrder' +And request serviceOrderData[17] +When method post +Then status 201 +And def serviceOrderId = $.id +Given path 'test/listener' +And params {serviceOrderId : '#(serviceOrderId)'} +When method get +Then status 200 +And assert response.length == 1 +And match $[0] contains { eventId : '#notnull' , eventType : 'ServiceOrderCreationNotification' , eventDate : '#notnull' , event :'#notnull'} +And def eventId = $[0].eventId +And def eventDate = $[0].eventDate +And call checkDateFormat(eventDate) +Given path 'hub',hubId +When method delete +Then status 204 +Given path 'test/listener',eventId +When method delete +Then status 204 +Given path 'serviceOrder',serviceOrderId +When method delete +Then status 204 \ No newline at end of file -- cgit 1.2.3-korg