From 5c07f0088fd71e30bfd8dc92b870f604b4297420 Mon Sep 17 00:00:00 2001 From: Norm Traxler Date: Mon, 21 Jan 2019 21:03:59 +0000 Subject: NetworkDiscCtxBuilder error handling Issue-ID: LOG-938 Change-Id: I20e8592efe5f1ca8960f228041303c8d25628018 Signed-off-by: Norm Traxler --- .../test/NetworkDiscoveryRspInfoTest.java | 104 ---- .../test/jolt/TransformationTest.java | 48 +- .../NetworkDiscoveryContextBuilderTest.java | 163 +++--- src/test/resources/jolt/serviceDecompResponse.json | 211 ++++++++ .../jolt/serviceDecompToModelContext-expected.json | 108 ++++ .../jolt/serviceDecompToNdQuery-expected.json | 16 - .../jolt/serviceDecompToNdQuery-input.json | 260 ---------- .../jolt/serviceDecompToNdResources-expected.json | 21 + src/test/resources/junit/SD_response.json | 557 --------------------- src/test/resources/junit/networkDiscovery-1.json | 83 --- .../junit/networkDiscoveryResponse-1.json | 91 ---- .../junit/networkDiscoveryResponseL3Network.json | 83 +++ .../junit/networkDiscoveryResponseVserver-1.json | 99 ++++ .../resources/junit/serviceDecomposition-1.json | 461 ----------------- .../junit/serviceDecompositionResponse-1.json | 461 +++++++++++++++++ 15 files changed, 1093 insertions(+), 1673 deletions(-) delete mode 100644 src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/NetworkDiscoveryRspInfoTest.java create mode 100644 src/test/resources/jolt/serviceDecompResponse.json create mode 100644 src/test/resources/jolt/serviceDecompToModelContext-expected.json delete mode 100644 src/test/resources/jolt/serviceDecompToNdQuery-expected.json delete mode 100644 src/test/resources/jolt/serviceDecompToNdQuery-input.json create mode 100644 src/test/resources/jolt/serviceDecompToNdResources-expected.json delete mode 100644 src/test/resources/junit/SD_response.json delete mode 100644 src/test/resources/junit/networkDiscovery-1.json delete mode 100644 src/test/resources/junit/networkDiscoveryResponse-1.json create mode 100644 src/test/resources/junit/networkDiscoveryResponseL3Network.json create mode 100644 src/test/resources/junit/networkDiscoveryResponseVserver-1.json delete mode 100644 src/test/resources/junit/serviceDecomposition-1.json create mode 100644 src/test/resources/junit/serviceDecompositionResponse-1.json (limited to 'src/test') diff --git a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/NetworkDiscoveryRspInfoTest.java b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/NetworkDiscoveryRspInfoTest.java deleted file mode 100644 index af2ba01..0000000 --- a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/NetworkDiscoveryRspInfoTest.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * ============LICENSE_START=================================================== - * Copyright (c) 2018 Amdocs - * ============================================================================ - * 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. - * ============LICENSE_END===================================================== - */ - -package org.onap.pomba.contextbuilder.networkdiscovery.test; - -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.CountDownLatch; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.onap.pomba.contextbuilder.networkdiscovery.model.NetworkDiscoveryRspInfo; -import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.NetworkDiscoveryNotification; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class }) -@WebAppConfiguration -@SpringBootTest -@TestPropertySource(properties = { "enricher.url=http://localhost:9505", "serviceDecomposition.host=localhost", - "networkDiscoveryMicroService.host=localhost", - "networkDiscoveryMicroService.responseTimeOutInMilliseconds=1000" }) -public class NetworkDiscoveryRspInfoTest { - NetworkDiscoveryRspInfo networkDiscoveryRspInfo = new NetworkDiscoveryRspInfo(); - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetRequestId() throws Exception { - String requestId = "2123"; - networkDiscoveryRspInfo.setRequestId(requestId); - assertEquals(requestId, networkDiscoveryRspInfo.getRequestId()); - } - - @Test - public void testGetResourceType() throws Exception { - String resourceType = "vserver"; - networkDiscoveryRspInfo.setResourceType(resourceType); - assertEquals(resourceType, networkDiscoveryRspInfo.getResourceType()); - } - - @Test - public void testGetResourceId() throws Exception { - String resourceId = "2123"; - networkDiscoveryRspInfo.setResourceId(resourceId); - assertEquals(resourceId, networkDiscoveryRspInfo.getResourceId()); - } - - @Test - public void testGetLatchSignal() throws Exception { - CountDownLatch latchSignal = new CountDownLatch(5); - networkDiscoveryRspInfo.setLatchSignal(latchSignal); - assertEquals(latchSignal, networkDiscoveryRspInfo.getLatchSignal()); - } - - @Test - public void testGetNetworkDiscoveryNotificationList() throws Exception { - NetworkDiscoveryNotification tmpNof = new NetworkDiscoveryNotification(); - List myList = Arrays.asList(tmpNof); - - networkDiscoveryRspInfo.setNetworkDiscoveryNotificationList(myList); - networkDiscoveryRspInfo.toString(); - assertEquals(myList, networkDiscoveryRspInfo.getNetworkDiscoveryNotificationList()); - } - - @Test - public void testGetRelatedRequestIdList() throws Exception { - List myList = Arrays.asList("myTest123"); - - networkDiscoveryRspInfo.setRelatedRequestIdList(myList); - assertEquals(myList, networkDiscoveryRspInfo.getRelatedRequestIdList()); - } -} diff --git a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/jolt/TransformationTest.java b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/jolt/TransformationTest.java index 7518591..29a4a6f 100644 --- a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/jolt/TransformationTest.java +++ b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/test/jolt/TransformationTest.java @@ -28,10 +28,12 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.onap.pomba.contextbuilder.networkdiscovery.model.NdQuery; +import org.onap.pomba.common.datatypes.ModelContext; +import org.onap.pomba.contextbuilder.networkdiscovery.model.NdResources; public class TransformationTest { + private static final String CONFIG_JOLT_DIRECTORY = "config/jolt/"; private static final String TEST_RESOURCES = "src/test/resources/jolt/"; @Rule @@ -39,26 +41,58 @@ public class TransformationTest { @Test - public void testTransformNdQuery() { + public void testTransformNdResources() { - Object sourceObject = JsonUtils.filepathToObject(TEST_RESOURCES + "serviceDecompToNdQuery-input.json"); + Object sourceObject = JsonUtils.filepathToObject(TEST_RESOURCES + "/serviceDecompResponse.json"); Object sourceObject1 = JsonUtils.jsonToObject(JsonUtils.toJsonString(sourceObject)); - List chainrSpecJSON = JsonUtils.filepathToList("config/ndQuery.spec"); - Chainr chainr = Chainr.fromSpec(chainrSpecJSON); + List chainrSpecJson = JsonUtils.filepathToList(CONFIG_JOLT_DIRECTORY + "sdToNdResourcesSpec.json"); + Chainr chainr = Chainr.fromSpec(chainrSpecJson); + Object output = chainr.transform(sourceObject1); + + String resultJson = JsonUtils.toJsonString(output); + + System.err.println(resultJson); + + // read the result into the NqQuery class: + Gson gson = new Gson(); + NdResources ndQuery = gson.fromJson(resultJson, NdResources.class); + + // convert ndQuery back to json: + String ndQueryToJson = gson.toJson(ndQuery); + + + + // Compare with expected output: + Object expectedObject = JsonUtils.filepathToObject(TEST_RESOURCES + "serviceDecompToNdResources-expected.json"); + + Assert.assertEquals("Json transformation result does not match expected content", + JsonUtils.toPrettyJsonString(expectedObject), + JsonUtils.toPrettyJsonString(JsonUtils.jsonToObject(ndQueryToJson))); + + } + + @Test + public void testTransformModelContext() { + + Object sourceObject = JsonUtils.filepathToObject(TEST_RESOURCES + "serviceDecompResponse.json"); + Object sourceObject1 = JsonUtils.jsonToObject(JsonUtils.toJsonString(sourceObject)); + + List chainrSpecJson = JsonUtils.filepathToList(CONFIG_JOLT_DIRECTORY + "sdToModelContextSpec.json"); + Chainr chainr = Chainr.fromSpec(chainrSpecJson); Object output = chainr.transform(sourceObject1); String resultJson = JsonUtils.toJsonString(output); // read the result into the NqQuery class: Gson gson = new Gson(); - NdQuery ndQuery = gson.fromJson(resultJson, NdQuery.class); + ModelContext ndQuery = gson.fromJson(resultJson, ModelContext.class); // convert ndQuery back to json: String ndQueryToJson = gson.toJson(ndQuery); // Compare with expected output: - Object expectedObject = JsonUtils.filepathToObject(TEST_RESOURCES + "serviceDecompToNdQuery-expected.json"); + Object expectedObject = JsonUtils.filepathToObject(TEST_RESOURCES + "serviceDecompToModelContext-expected.json"); Assert.assertEquals("Json transformation result does not match expected content", JsonUtils.toPrettyJsonString(expectedObject), diff --git a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java index 024f21a..c7475b0 100644 --- a/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java +++ b/src/test/java/org/onap/pomba/contextbuilder/networkdiscovery/unittest/service/NetworkDiscoveryContextBuilderTest.java @@ -24,15 +24,13 @@ import static org.mockito.Mockito.mock; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.junit.WireMockRule; import com.github.tomakehurst.wiremock.matching.UrlPattern; +import com.google.gson.Gson; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Base64; -import java.util.List; import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -44,11 +42,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.pomba.common.datatypes.DataQuality; +import org.onap.pomba.common.datatypes.ModelContext; import org.onap.pomba.contextbuilder.networkdiscovery.service.rs.RestService; -import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.Attribute; -import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.NetworkDiscoveryNotification; -import org.onap.sdnc.apps.pomba.networkdiscovery.datamodel.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -75,10 +70,8 @@ public class NetworkDiscoveryContextBuilderTest { private String partnerName = "POMBA"; private String transactionId = UUID.randomUUID().toString(); private String serviceInstanceId = "c6456519-6acf-4adb-997c-3c363dd4caaf"; - private String requestId = "2131__1"; HttpServletRequest httpServletRequest = mock(HttpServletRequest.class); - NetworkDiscoveryNotification networkDiscoveryNotification = simulateNetworkDiscoveryNotification(); @Autowired Environment environment; @@ -135,8 +128,8 @@ public class NetworkDiscoveryContextBuilderTest { public void testVerifyServiceDecomposition() throws Exception { String urlStr = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(urlStr, "junit/SD_response.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(urlStr, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + addResponseAny("junit/networkDiscoveryResponseVserver-1.json", networkDiscoveryMicroServiceRule); Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, transactionId, null, null, serviceInstanceId, null, null); assertEquals(Status.OK.getStatusCode(), response.getStatus()); @@ -146,20 +139,73 @@ public class NetworkDiscoveryContextBuilderTest { public void testVerifyGetContext() throws Exception { String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(serviceDecompUrl, "junit/serviceDecomposition-1.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + + String vserverPayload = readFully( + ClassLoader.getSystemResourceAsStream("junit/networkDiscoveryResponseVserver-1.json")); + networkDiscoveryMicroServiceRule.stubFor(WireMock + .any(WireMock.urlPathEqualTo("/network-discovery/v1/network/resource")) + .withQueryParam("resourceType", WireMock.equalTo("vserver")).willReturn(okJson(vserverPayload))); + + String l3networkPayload = readFully( + ClassLoader.getSystemResourceAsStream("junit/networkDiscoveryResponseL3Network.json")); + networkDiscoveryMicroServiceRule.stubFor(WireMock + .any(WireMock.urlPathEqualTo("/network-discovery/v1/network/resource")) + .withQueryParam("resourceType", WireMock.equalTo("l3-network")).willReturn(okJson(l3networkPayload))); Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, transactionId, null, null, serviceInstanceId, null, null); assertEquals(Status.OK.getStatusCode(), response.getStatus()); + + System.out.println(response.getEntity()); + + Gson gson = new Gson(); + ModelContext modelContext = gson.fromJson((String) response.getEntity(), ModelContext.class); + assertTrue(modelContext.getVnfs().size() > 0); + assertTrue(modelContext.getVnfs().get(0).getVfModules().size() > 0); + assertTrue(modelContext.getVnfs().get(0).getVfModules().get(0).getVms().size() > 0); + + } + + @Test + public void testVerifyGetContextNdResourceNotFound() throws Exception { + + String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + UrlPattern testPath = WireMock.anyUrl(); + networkDiscoveryMicroServiceRule.stubFor(get(testPath).willReturn(WireMock.notFound())); + + Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, transactionId, + null, null, serviceInstanceId, null, null); + + assertEquals(Status.OK.getStatusCode(), response.getStatus()); + + Gson gson = new Gson(); + ModelContext modelContext = gson.fromJson((String)response.getEntity(), ModelContext.class); + assertTrue(modelContext.getVnfs().size() > 0); + assertTrue(modelContext.getVnfs().get(0).getVfModules().size() > 0); + assertTrue(modelContext.getVnfs().get(0).getVfModules().get(0).getVms().size() > 0); + + } + + @Test + public void testVerifyGetContextSdResoureNofFound() throws Exception { + + UrlPattern testPath = WireMock.anyUrl(); + serviceDecompositionRule.stubFor(get(testPath).willReturn(WireMock.notFound())); + + Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, transactionId, + null, null, serviceInstanceId, null, null); + + assertEquals(Status.NOT_FOUND.getStatusCode(), response.getStatus()); } @Test public void testVerifyNoPartnerNameWithFromAppId() throws Exception { String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(serviceDecompUrl, "junit/serviceDecomposition-1.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + addResponseAny("junit/networkDiscoveryResponseVserver-1.json", networkDiscoveryMicroServiceRule); Response response = this.restService.getContext(httpServletRequest, authorization, null, transactionId, partnerName, null, serviceInstanceId, null, null); @@ -169,8 +215,8 @@ public class NetworkDiscoveryContextBuilderTest { @Test public void testVerifyNoRequestIdNoTransactionId() throws Exception { String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(serviceDecompUrl, "junit/serviceDecomposition-1.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + addResponseAny("junit/networkDiscoveryResponseVserver-1.json", networkDiscoveryMicroServiceRule); Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, null, null, null, serviceInstanceId, null, null); @@ -180,8 +226,8 @@ public class NetworkDiscoveryContextBuilderTest { @Test public void testVerifyNoPartnerNameNoFromAppId() throws Exception { String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(serviceDecompUrl, "junit/serviceDecomposition-1.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + addResponseAny("junit/networkDiscoveryResponseVserver-1.json", networkDiscoveryMicroServiceRule); Response response = this.restService.getContext(httpServletRequest, authorization, null, transactionId, null, null, serviceInstanceId, null, null); @@ -191,8 +237,8 @@ public class NetworkDiscoveryContextBuilderTest { @Test public void testVerifyNoRequestIdWithTransactionId() throws Exception { String serviceDecompUrl = "/service-decomposition/service/context?serviceInstanceId=" + serviceInstanceId; - addResponse(serviceDecompUrl, "junit/serviceDecomposition-1.json", serviceDecompositionRule); - addResponseAny("junit/networkDiscoveryResponse-1.json", networkDiscoveryMicroServiceRule); + addResponse(serviceDecompUrl, "junit/serviceDecompositionResponse-1.json", serviceDecompositionRule); + addResponseAny("junit/networkDiscoveryResponseVserver-1.json", networkDiscoveryMicroServiceRule); Response response = this.restService.getContext(httpServletRequest, authorization, partnerName, null, null, transactionId, serviceInstanceId, null, null); @@ -206,8 +252,8 @@ public class NetworkDiscoveryContextBuilderTest { private void addResponseAny(String classpathResource, WireMockRule thisMock) throws IOException { String payload = readFully(ClassLoader.getSystemResourceAsStream(classpathResource)); - UrlPattern tPath = WireMock.anyUrl(); - thisMock.stubFor(get(tPath).willReturn(okJson(payload))); + UrlPattern testPath = WireMock.anyUrl(); + thisMock.stubFor(get(testPath).willReturn(okJson(payload))); } private String readFully(InputStream in) throws IOException { @@ -221,75 +267,4 @@ public class NetworkDiscoveryContextBuilderTest { } return content.toString(); } - - private NetworkDiscoveryNotification simulateNetworkDiscoveryNotification() { - Resource myResource = new Resource(); - myResource.setId("25fb07ab-0478-465e-a021-6384ac299671"); - myResource.setType("vserver"); - DataQuality dataQuality = new DataQuality(); - dataQuality.setStatus(DataQuality.Status.ok); - myResource.setDataQuality(dataQuality); - Attribute attribute = new Attribute(); - attribute.setName("vserver-id"); - attribute.setValue("25fb07ab-0478-465e-a021-6384ac299671"); - attribute.setDataQuality(dataQuality); - List attributeList = new ArrayList<>(); - attributeList.add(attribute); - - attribute.setName("power-state"); - attribute.setValue("1"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("vm-state"); - attribute.setValue("active"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("status"); - attribute.setValue("ACTIVE"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("host-status"); - attribute.setValue("UNKNOWN"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("updated"); - attribute.setValue("2017-11-20T04:26:13Z"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("disk-allocation-gb"); - attribute.setValue(".010"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("memory-usage-mb"); - attribute.setValue("null"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName("cpu-util-percent"); - attribute.setValue(".048"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - - attribute.setName(".048"); - attribute.setValue("2018-07-26 01:37:07 +0000"); - attribute.setDataQuality(dataQuality); - attributeList.add(attribute); - myResource.setAttributeList(attributeList); - - NetworkDiscoveryNotification notification = new NetworkDiscoveryNotification(); - notification.setResources(Arrays.asList(myResource)); - notification.setAckFinalIndicator(true); - notification.setCode(200); - notification.setRequestId(requestId); - notification.setMessage("OK"); - - return notification; - } - } diff --git a/src/test/resources/jolt/serviceDecompResponse.json b/src/test/resources/jolt/serviceDecompResponse.json new file mode 100644 index 0000000..2e2f38c --- /dev/null +++ b/src/test/resources/jolt/serviceDecompResponse.json @@ -0,0 +1,211 @@ +{ + "model-version-id": "e2d52f32-a952-46f5-800c-c250903625d6", + "service-instance-id": "PombaDemoCust_001-SerivceInst-001", + "resource-version": "1545324562797", + "generic-vnfs": [ + { + "nf-role": "", + "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", + "vnf-id": "PombaDemoCust_001-VNF-id-001", + "nf-type": "", + "l3-networks": [ + { + "network-role": "", + "network-technology": "", + "network-id": "2ea02809-7279-4b5e-931a-62b231615497", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "resource-version": "1547484061985", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "network-name": "NET_1105", + "is-shared-network": true, + "model-invariant-id": "pomba-demo-sdc-model-001" + }, + { + "network-role": "", + "network-technology": "", + "network-id": "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "resource-version": "1547484429696", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "network-name": "NET_1106", + "is-shared-network": true, + "model-invariant-id": "pomba-demo-sdc-model-001" + } + ], + "prov-status": "PREPROV", + "vnf-type": "vFW-vSINK-service/vFWvSINK 0", + "orchestration-status": "Created", + "nf-naming-code": "", + "in-maint": false, + "nf-function": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "vservers": [ + { + "in-maint": false, + "resource-version": "1545323228761", + "vserver-name": "Firewall-001", + "prov-status": "ACTIVE", + "vserver-id": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", + "vserver-name2": "Firewall-001", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9/servers/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", + "is-closed-loop-disabled": false + } + ], + "resource-version": "1547828735448", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "vf-modules": { + "vf-module": [ + { + "vf-module-name": "PombaDemoCust_001-VNF-id-001-VfModule001-name", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "heat-stack-id": "HeatStackId-001", + "resource-version": "1547828735835", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "is-base-vf-module": true, + "vf-module-id": "PombaDemoCust_001-VNF-id-001-VfModule001", + "module-index": 0, + "model-invariant-id": "pomba-demo-sdc-model-001", + "orchestration-status": "Active", + "automated-assignment": true + } + ] + }, + "model-invariant-id": "pomba-demo-sdc-model-001", + "vnf-name": "Firewall-1", + "is-closed-loop-disabled": false + }, + { + "nf-role": "", + "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", + "vnf-id": "PombaDemoCust_001-VNF-id-001-2", + "nf-type": "", + "l3-networks": [ + { + "network-role": "", + "network-technology": "", + "network-id": "2ea02809-7279-4b5e-931a-62b231615497-1", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "resource-version": "1547484061985", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "network-name": "NET_1105", + "is-shared-network": true, + "model-invariant-id": "pomba-demo-sdc-model-001" + }, + { + "network-role": "", + "network-technology": "", + "relationship-list": { + "relationship": [ + { + "related-to": "service-instance", + "relationship-data": [ + { + "relationship-value": "PombaDemoCust_001", + "relationship-key": "customer.global-customer-id" + }, + { + "relationship-value": "SDN-ETHERNET-INTERNET", + "relationship-key": "service-subscription.service-type" + }, + { + "relationship-value": "PombaDemoCust_001-SerivceInst-001", + "relationship-key": "service-instance.service-instance-id" + } + ], + "related-link": "/aai/v13/business/customers/customer/PombaDemoCust_001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/PombaDemoCust_001-SerivceInst-001", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-to-property": [ + { + "property-key": "service-instance.service-instance-name" + } + ] + }, + { + "related-to": "generic-vnf", + "relationship-data": [ + { + "relationship-value": "PombaDemoCust_001-VNF-id-001", + "relationship-key": "generic-vnf.vnf-id" + } + ], + "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/PombaDemoCust_001-VNF-id-001", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "Firewall-1" + } + ] + }, + { + "related-to": "generic-vnf", + "relationship-data": [ + { + "relationship-value": "PombaDemoCust_001-VNF-id-001-2", + "relationship-key": "generic-vnf.vnf-id" + } + ], + "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/PombaDemoCust_001-VNF-id-001-2", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "Firewall-2" + } + ] + } + ] + }, + "network-id": "01e8d84a-17a6-47b5-a167-6a45d1d56603-1", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "resource-version": "1547484429696", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "network-name": "NET_1106", + "is-shared-network": true, + "model-invariant-id": "pomba-demo-sdc-model-001" + } + ], + "prov-status": "PREPROV", + "vnf-type": "vFW-vSINK-service/vFWvSINK 0", + "orchestration-status": "Created", + "nf-naming-code": "", + "in-maint": false, + "nf-function": "", + "model-version-id": "pomba-demo-sdc-model-001-version001", + "vservers": [ + { + "in-maint": true, + "resource-version": "1547822239190", + "vserver-name": "Firewall-001-2", + "prov-status": "UNKNOWN", + "vserver-id": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2", + "vserver-name2": "Firewall-001-2", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9/servers/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2", + "is-closed-loop-disabled": false + } + ], + "resource-version": "1547822479098", + "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", + "model-invariant-id": "pomba-demo-sdc-model-001", + "vnf-name": "Firewall-2", + "is-closed-loop-disabled": false + } + ], + "model-invariant-id": "59dd4d63-8f21-406c-98c0-3b057bb86820" +} \ No newline at end of file diff --git a/src/test/resources/jolt/serviceDecompToModelContext-expected.json b/src/test/resources/jolt/serviceDecompToModelContext-expected.json new file mode 100644 index 0000000..31f1318 --- /dev/null +++ b/src/test/resources/jolt/serviceDecompToModelContext-expected.json @@ -0,0 +1,108 @@ +{ + "service" : { + "uuid" : "PombaDemoCust_001-SerivceInst-001", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ] + }, + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "vnfList" : [ { + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "vfModuleList" : [ { + "maxInstances" : 0, + "minInstances" : 0, + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "vmList" : [ { + "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "pServer" : { + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "pInterfaceList" : [ ], + "logicalLinkList" : [ ] + }, + "lInterfaceList" : [ ] + } ], + "networkList" : [ { + "uuid" : "2ea02809-7279-4b5e-931a-62b231615497", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "networkPolicyList" : [ ] + }, { + "uuid" : "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "networkPolicyList" : [ ] + } ] + } ], + "vnfcList" : [ ], + "networkList" : [ ] + }, { + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "vfModuleList" : [ { + "maxInstances" : 0, + "minInstances" : 0, + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "vmList" : [ { + "uuid" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "pServer" : { + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "pInterfaceList" : [ ], + "logicalLinkList" : [ ] + }, + "lInterfaceList" : [ ] + } ], + "networkList" : [ { + "uuid" : "2ea02809-7279-4b5e-931a-62b231615497-1", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "networkPolicyList" : [ ] + }, { + "uuid" : "01e8d84a-17a6-47b5-a167-6a45d1d56603-1", + "dataQuality" : { + "status" : "ok" + }, + "attributeList" : [ ], + "networkPolicyList" : [ ] + } ] + } ], + "vnfcList" : [ ], + "networkList" : [ ] + } ], + "pnfList" : [ ], + "networkList" : [ ] +} \ No newline at end of file diff --git a/src/test/resources/jolt/serviceDecompToNdQuery-expected.json b/src/test/resources/jolt/serviceDecompToNdQuery-expected.json deleted file mode 100644 index cfc5a5b..0000000 --- a/src/test/resources/jolt/serviceDecompToNdQuery-expected.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "ndQuery": [ - { - "ndResourcesList": [ - { - "ndResources": [ - { - "resourceId": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", - "resourceType": "vserver" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/test/resources/jolt/serviceDecompToNdQuery-input.json b/src/test/resources/jolt/serviceDecompToNdQuery-input.json deleted file mode 100644 index 2954141..0000000 --- a/src/test/resources/jolt/serviceDecompToNdQuery-input.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001-VNF-id-001", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/PombaDemoCust_001-VNF-id-001", - "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - } - ] - }, - { - "related-to": "l3-network", - "relationship-data": [ - { - "relationship-value": "2ea02809-7279-4b5e-931a-62b231615497", - "relationship-key": "l3-network.network-id" - } - ], - "related-link": "/aai/v13/network/l3-networks/l3-network/2ea02809-7279-4b5e-931a-62b231615497", - "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-to-property": [ - { - "property-key": "l3-network.network-name", - "property-value": "NET_1105" - } - ] - }, - { - "related-to": "pnf", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001-PNF2-id-001", - "relationship-key": "pnf.pnf-name" - } - ], - "related-link": "/aai/v13/network/pnfs/pnf/PombaDemoCust_001-PNF2-id-001", - "relationship-label": "org.onap.relationships.inventory.ComposedOf" - }, - { - "related-to": "pnf", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001-PNF-id-001", - "relationship-key": "pnf.pnf-name" - } - ], - "related-link": "/aai/v13/network/pnfs/pnf/PombaDemoCust_001-PNF-id-001", - "relationship-label": "org.onap.relationships.inventory.ComposedOf" - }, - { - "related-to": "l3-network", - "relationship-data": [ - { - "relationship-value": "01e8d84a-17a6-47b5-a167-6a45d1d56603", - "relationship-key": "l3-network.network-id" - } - ], - "related-link": "/aai/v13/network/l3-networks/l3-network/01e8d84a-17a6-47b5-a167-6a45d1d56603", - "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-to-property": [ - { - "property-key": "l3-network.network-name", - "property-value": "NET_1106" - } - ] - } - ] - }, - "model-version-id": "e2d52f32-a952-46f5-800c-c250903625d6", - "service-instance-id": "PombaDemoCust_001-SerivceInst-001", - "resource-version": "1545324562797", - "generic-vnfs": [ - { - "nf-role": "", - "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", - "relationship-list": { - "relationship": [ - { - "related-to": "service-instance", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001", - "relationship-key": "customer.global-customer-id" - }, - { - "relationship-value": "SDN-ETHERNET-INTERNET", - "relationship-key": "service-subscription.service-type" - }, - { - "relationship-value": "PombaDemoCust_001-SerivceInst-001", - "relationship-key": "service-instance.service-instance-id" - } - ], - "related-link": "/aai/v13/business/customers/customer/PombaDemoCust_001/service-subscriptions/service-subscription/SDN-ETHERNET-INTERNET/service-instances/service-instance/PombaDemoCust_001-SerivceInst-001", - "relationship-label": "org.onap.relationships.inventory.ComposedOf", - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name" - } - ] - }, - { - "related-to": "vserver", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "PombaRegion001", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "PombaRegion001-tenant-001", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", - "relationship-key": "vserver.vserver-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PombaRegion001/tenants/tenant/PombaRegion001-tenant-001/vservers/vserver/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", - "relationship-label": "tosca.relationships.HostedOn", - "related-to-property": [ - { - "property-key": "vserver.vserver-name", - "property-value": "Firewall-001" - } - ] - }, - { - "related-to": "pserver", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001-pserver-id-001", - "relationship-key": "pserver.hostname" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/pservers/pserver/PombaDemoCust_001-pserver-id-001", - "relationship-label": "tosca.relationships.HostedOn", - "related-to-property": [ - { - "property-key": "pserver.pserver-name2", - "property-value": "PombaDemoCust_001-pserver-id-001-name2" - } - ] - } - ] - }, - "vnf-id": "PombaDemoCust_001-VNF-id-001", - "nf-type": "", - "prov-status": "PREPROV", - "vnf-type": "vFW-vSINK-service/vFWvSINK 0", - "orchestration-status": "Created", - "nf-naming-code": "", - "in-maint": false, - "nf-function": "", - "model-version-id": "e2d52f32-a952-46f5-800c-c250903625d6", - "vservers": [ - { - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "PombaDemoCust_001-VNF-id-001", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/PombaDemoCust_001-VNF-id-001", - "relationship-label": "tosca.relationships.HostedOn", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - } - ] - }, - { - "related-to": "flavor", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "PombaRegion001", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "PombaRegion001-flavor001", - "relationship-key": "flavor.flavor-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PombaRegion001/flavors/flavor/PombaRegion001-flavor001", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [ - { - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - } - ] - }, - { - "related-to": "image", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "PombaRegion001", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "PombaRegion001-image001", - "relationship-key": "image.image-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PombaRegion001/images/image/PombaRegion001-image001", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [ - { - "property-key": "image.image-name", - "property-value": "unknown" - } - ] - } - ] - }, - "in-maint": false, - "resource-version": "1545323228761", - "vserver-name": "Firewall-001", - "prov-status": "ACTIVE", - "vserver-id": "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", - "vserver-name2": "Firewall-001", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9/servers/a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", - "is-closed-loop-disabled": false - } - ], - "resource-version": "1545324724996", - "model-customization-id": "3b822416-475d-4e1c-aac3-2544b0a0fdfc", - "model-invariant-id": "59dd4d63-8f21-406c-98c0-3b057bb86820", - "vnf-name": "Firewall-1", - "is-closed-loop-disabled": false - } - ], - "model-invariant-id": "59dd4d63-8f21-406c-98c0-3b057bb86820" -} \ No newline at end of file diff --git a/src/test/resources/jolt/serviceDecompToNdResources-expected.json b/src/test/resources/jolt/serviceDecompToNdResources-expected.json new file mode 100644 index 0000000..1351350 --- /dev/null +++ b/src/test/resources/jolt/serviceDecompToNdResources-expected.json @@ -0,0 +1,21 @@ +{ + "ndResources" : [ { + "resourceId" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9", + "resourceType" : "vserver" + }, { + "resourceId" : "2ea02809-7279-4b5e-931a-62b231615497", + "resourceType" : "l3-network" + }, { + "resourceId" : "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "resourceType" : "l3-network" + }, { + "resourceId" : "a6a609e3-967a-48bd-8ce5-41c7ff5c19b9-2", + "resourceType" : "vserver" + }, { + "resourceId" : "2ea02809-7279-4b5e-931a-62b231615497-1", + "resourceType" : "l3-network" + }, { + "resourceId" : "01e8d84a-17a6-47b5-a167-6a45d1d56603-1", + "resourceType" : "l3-network" + } ] +} \ No newline at end of file diff --git a/src/test/resources/junit/SD_response.json b/src/test/resources/junit/SD_response.json deleted file mode 100644 index d4db960..0000000 --- a/src/test/resources/junit/SD_response.json +++ /dev/null @@ -1,557 +0,0 @@ -{ - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df68", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df68", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "PacketGenerator-1" - } - ] - }, - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df69", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df69", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "PacketGenerator-2" - } - ] - } - ] - }, - "model-version-id": "d3d6cf83-d03a-43cc-99ff-206d40bb9a72", - "service-instance-id": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "resource-version": "1527637758480", - "generic-vnfs": [ - { - "nf-role": "", - "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", - "relationship-list": { - "relationship": [ - { - "related-to": "service-instance", - "relationship-data": [ - { - "relationship-value": "Demonstration", - "relationship-key": "customer.global-customer-id" - }, - { - "relationship-value": "vFWCL", - "relationship-key": "service-subscription.service-type" - }, - { - "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "relationship-key": "service-instance.service-instance-id" - } - ], - "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name", - "property-value": "Firewall1" - } - ] - }, - { - "related-to": "l3-network", - "relationship-data": [ - { - "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-key": "l3-network.network-id" - } - ], - "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [ - { - "property-key": "l3-network.network-name", - "property-value": "HNPORTALOAM.OAM" - } - ] - }, - { - "related-to": "vserver", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", - "relationship-key": "vserver.vserver-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299671" - }, - { - "related-to": "vserver", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299672", - "relationship-key": "vserver.vserver-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299672" - } - ] - }, - "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df68", - "nf-type": "", - "l3-networks": [ - { - "network-role": "HNPORTALOAM.OAM", - "network-technology": "ovs", - "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", - "network-id": "HNP1d77c-1222-41ec-b7f3-94bb30951870", - "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", - "is-external-network": false, - "is-bound-to-vpn": false, - "is-provider-network": false, - "network-type": "OVS_PROVIDER_VLAN", - "orchestration-status": "active", - "network-role-instance": 0, - "resource-version": "1526558298075", - "network-name": "HNPORTALOAM.OAM", - "is-shared-network": false - } - ], - "prov-status": "PREPROV", - "vnf-type": "vFW-vSINK-service/vPKG 0", - "orchestration-status": "Created", - "nf-naming-code": "", - "in-maint": false, - "nf-function": "", - "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", - "vservers": [ - { - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - } - ] - }, - { - "related-to": "flavor", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [ - { - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - } - ] - }, - { - "related-to": "image", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [ - { - "property-key": "image.image-name", - "property-value": "unknown" - } - ] - } - ] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", - "is-closed-loop-disabled": false - }, - { - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - } - ] - }, - { - "related-to": "flavor", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [ - { - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - } - ] - }, - { - "related-to": "image", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [ - { - "property-key": "image.image-name", - "property-value": "unknown" - } - ] - } - ] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299672", - "is-closed-loop-disabled": false - } - ], - "resource-version": "1527638176989", - "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", - "vf-modules": { - "vf-module": [ - { - "vf-module-name": "vPacketGen-VNF-1128-3", - "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", - "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", - "resource-version": "1527641224058", - "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", - "is-base-vf-module": true, - "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", - "module-index": 0, - "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", - "orchestration-status": "active" - } - ] - }, - "vserver": [ - { - "vserver-name": "Firewall-1", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" - } - ], - "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", - "vnf-name": "PacketGenerator-1", - "is-closed-loop-disabled": false - }, - { - "nf-role": "", - "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b9", - "relationship-list": { - "relationship": [ - { - "related-to": "service-instance", - "relationship-data": [ - { - "relationship-value": "Demonstration", - "relationship-key": "customer.global-customer-id" - }, - { - "relationship-value": "vFWCL", - "relationship-key": "service-subscription.service-type" - }, - { - "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "relationship-key": "service-instance.service-instance-id" - } - ], - "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", - "related-to-property": [ - { - "property-key": "service-instance.service-instance-name", - "property-value": "Firewall1" - } - ] - }, - { - "related-to": "l3-network", - "relationship-data": [ - { - "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-key": "l3-network.network-id" - } - ], - "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951871", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [ - { - "property-key": "l3-network.network-name", - "property-value": "HNPORTALOAM.OAM" - } - ] - }, - { - "related-to": "vserver", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", - "relationship-key": "vserver.vserver-id" - } - ], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b" - } - ] - }, - "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df69", - "nf-type": "", - "l3-networks": [ - { - "network-role": "HNPORTALOAM.OAM", - "network-technology": "ovs", - "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", - "network-id": "HNP1d77c-1222-41ec-b7f3-94bb30951870", - "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", - "is-external-network": false, - "is-bound-to-vpn": false, - "is-provider-network": false, - "network-type": "OVS_PROVIDER_VLAN", - "orchestration-status": "active", - "network-role-instance": 0, - "resource-version": "1526558298075", - "network-name": "HNPORTALOAM.OAM", - "is-shared-network": false - } - ], - "prov-status": "PREPROV", - "vnf-type": "vFW-vSINK-service/vPKG 0", - "orchestration-status": "Created", - "nf-naming-code": "", - "in-maint": false, - "nf-function": "", - "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", - "vservers": [ - { - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "relationship-data": [ - { - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - } - ], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - } - ] - }, - { - "related-to": "flavor", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [ - { - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - } - ] - }, - { - "related-to": "image", - "relationship-data": [ - { - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - } - ], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [ - { - "property-key": "image.image-name", - "property-value": "unknown" - } - ] - } - ] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", - "is-closed-loop-disabled": false - } - ], - "resource-version": "1527638176989", - "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", - "vf-modules": { - "vf-module": [ - { - "vf-module-name": "vPacketGen-VNF-1128-3", - "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", - "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", - "resource-version": "1527641224058", - "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", - "is-base-vf-module": true, - "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", - "module-index": 0, - "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", - "orchestration-status": "active" - } - ] - }, - "vserver": [ - { - "vserver-name": "Firewall-1", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" - } - ], - "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", - "vnf-name": "PacketGenerator-2", - "is-closed-loop-disabled": false - } - ], - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f", - "service-instance-name": "Firewall1" -} \ No newline at end of file diff --git a/src/test/resources/junit/networkDiscovery-1.json b/src/test/resources/junit/networkDiscovery-1.json deleted file mode 100644 index 6dd844f..0000000 --- a/src/test/resources/junit/networkDiscovery-1.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "requestId": "2131_1", - "code": 200, - "message": "OK", - "ackFinalIndicator": true, - "resources": [{ - "id": "25fb07ab-0478-465e-a021-6384ac299671", - "type": "vserver", - "dataQuality": { - "status": "ok" - }, - "attributeList": [{ - "name": "vserver-id", - "value": "25fb07ab-0478-465e-a021-6384ac299671", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "power-state", - "value": "1", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "vm-state", - "value": "active", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "status", - "value": "ACTIVE", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "host-status", - "value": "UNKNOWN", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "updated", - "value": "2017-11-20T04:26:13Z", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "disk-allocation-gb", - "value": ".010", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "memory-usage-mb", - "value": "null", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "cpu-util-percent", - "value": ".048", - "dataQuality": { - "status": "ok" - } - }, - { - "name": "retrieval-timestamp", - "value": "2018-07-26 01:37:07 +0000", - "dataQuality": { - "status": "ok" - } - }] - }] -} \ No newline at end of file diff --git a/src/test/resources/junit/networkDiscoveryResponse-1.json b/src/test/resources/junit/networkDiscoveryResponse-1.json deleted file mode 100644 index 7df8470..0000000 --- a/src/test/resources/junit/networkDiscoveryResponse-1.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "requestId": "2131_1", - "code": 200, - "message": "OK", - "ackFinalIndicator": true, - "resources": [ - { - "id": "2c311eae-f542-4173-8a01-582922abd495", - "name": null, - "type": "vserver", - "dataQuality": { - "status": "ok", - "errorText": null - }, - "attributeList": [ - { - "name": "id", - "value": "2c311eae-f542-4173-8a01-582922abd495", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "name", - "value": "norm_bouygues", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "inMaintenance", - "value": "false", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "imageId", - "value": "c0022890-d91f-422c-91c5-3866edeae768", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "status", - "value": "ACTIVE", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "vmState", - "value": "active", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "tenantId", - "value": "15ad36d394e744838e947ca90609f805", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "hostId", - "value": "ea1660efbbedda164379afacdc622305c4b88cebfb84119472d286a8", - "dataQuality": { - "status": "ok", - "errorText": null - } - }, - { - "name": "hostStatus", - "value": "UNKNOWN", - "dataQuality": { - "status": "ok", - "errorText": null - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/test/resources/junit/networkDiscoveryResponseL3Network.json b/src/test/resources/junit/networkDiscoveryResponseL3Network.json new file mode 100644 index 0000000..e7087e2 --- /dev/null +++ b/src/test/resources/junit/networkDiscoveryResponseL3Network.json @@ -0,0 +1,83 @@ +{ + "requestId": "88001", + "code": 200, + "message": "OK", + "ackFinalIndicator": true, + "resources": [ + { + "id": "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "name": null, + "type": "l3-network", + "dataQuality": { + "status": "ok", + "errorText": null + }, + "attributeList": [ + { + "name": "id", + "value": "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "name", + "value": "NET_1106", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "AdminState", + "value": "true", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "sharedNetwork", + "value": "true", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "status", + "value": "ACTIVE", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "subnets", + "value": "089c9160-6f7a-4ae0-83b7-33536b4c6672", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "tenantId", + "value": "cbd5e07f58d84ea6b795aa9f5f207df0", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "host-status", + "value": "UNKNOWN", + "dataQuality": { + "status": "ok", + "errorText": null + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/test/resources/junit/networkDiscoveryResponseVserver-1.json b/src/test/resources/junit/networkDiscoveryResponseVserver-1.json new file mode 100644 index 0000000..7861c71 --- /dev/null +++ b/src/test/resources/junit/networkDiscoveryResponseVserver-1.json @@ -0,0 +1,99 @@ +{ + "requestId": "2131_1", + "code": 200, + "message": "OK", + "ackFinalIndicator": true, + "resources": [ + { + "id": "25fb07ab-0478-465e-a021-6384ac299671", + "name": "vserver-name", + "type": "vserver", + "dataQuality": { + "status": "ok", + "errorText": null + }, + "attributeList": [ + { + "name": "id", + "value": "2c311eae-f542-4173-8a01-582922abd495", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "name", + "value": "norm-d2-k8s", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "hostname", + "value": "norm_bouygues", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "inMaintenance", + "value": "false", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "imageId", + "value": "c0022890-d91f-422c-91c5-3866edeae768", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "status", + "value": "ACTIVE", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "vmState", + "value": "active", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "tenantId", + "value": "15ad36d394e744838e947ca90609f805", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "hostId", + "value": "ea1660efbbedda164379afacdc622305c4b88cebfb84119472d286a8", + "dataQuality": { + "status": "ok", + "errorText": null + } + }, + { + "name": "hostStatus", + "value": "UNKNOWN", + "dataQuality": { + "status": "ok", + "errorText": null + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/test/resources/junit/serviceDecomposition-1.json b/src/test/resources/junit/serviceDecomposition-1.json deleted file mode 100644 index 10ebe4a..0000000 --- a/src/test/resources/junit/serviceDecomposition-1.json +++ /dev/null @@ -1,461 +0,0 @@ -{ - "relationship-list": { - "relationship": [{ - "related-to": "generic-vnf", - "relationship-data": [{ - "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df68", - "relationship-key": "generic-vnf.vnf-id" - }], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df68", - "related-to-property": [{ - "property-key": "generic-vnf.vnf-name", - "property-value": "PacketGenerator-1" - }] - }, - { - "related-to": "generic-vnf", - "relationship-data": [{ - "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df69", - "relationship-key": "generic-vnf.vnf-id" - }], - "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df69", - "related-to-property": [{ - "property-key": "generic-vnf.vnf-name", - "property-value": "PacketGenerator-2" - }] - }] - }, - "model-version-id": "d3d6cf83-d03a-43cc-99ff-206d40bb9a72", - "service-instance-id": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "resource-version": "1527637758480", - "generic-vnfs": [{ - "nf-role": "", - "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", - "relationship-list": { - "relationship": [{ - "related-to": "service-instance", - "relationship-data": [{ - "relationship-value": "Demonstration", - "relationship-key": "customer.global-customer-id" - }, - { - "relationship-value": "vFWCL", - "relationship-key": "service-subscription.service-type" - }, - { - "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "relationship-key": "service-instance.service-instance-id" - }], - "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", - "related-to-property": [{ - "property-key": "service-instance.service-instance-name", - "property-value": "Firewall1" - }] - }, - { - "related-to": "l3-network", - "relationship-data": [{ - "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-key": "l3-network.network-id" - }], - "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [{ - "property-key": "l3-network.network-name", - "property-value": "HNPORTALOAM.OAM" - }] - }, - { - "related-to": "vserver", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", - "relationship-key": "vserver.vserver-id" - }], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299671" - }, - { - "related-to": "vserver", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299672", - "relationship-key": "vserver.vserver-id" - }], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299672" - }] - }, - "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df68", - "nf-type": "", - "l3-networks": [{ - "network-role": "HNPORTALOAM.OAM", - "network-technology": "ovs", - "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", - "network-id": "HNP1d77c-1222-41ec-b7f3-94bb30951870", - "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", - "is-external-network": false, - "is-bound-to-vpn": false, - "is-provider-network": false, - "network-type": "OVS_PROVIDER_VLAN", - "orchestration-status": "active", - "network-role-instance": 0, - "resource-version": "1526558298075", - "network-name": "HNPORTALOAM.OAM", - "is-shared-network": false - }], - "prov-status": "PREPROV", - "vnf-type": "vFW-vSINK-service/vPKG 0", - "orchestration-status": "Created", - "nf-naming-code": "", - "in-maint": false, - "nf-function": "", - "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", - "vservers": [{ - "relationship-list": { - "relationship": [{ - "related-to": "generic-vnf", - "relationship-data": [{ - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - }], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [{ - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - }] - }, - { - "related-to": "flavor", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [{ - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - }] - }, - { - "related-to": "image", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [{ - "property-key": "image.image-name", - "property-value": "unknown" - }] - }] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", - "is-closed-loop-disabled": false - }, - { - "relationship-list": { - "relationship": [{ - "related-to": "generic-vnf", - "relationship-data": [{ - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - }], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [{ - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - }] - }, - { - "related-to": "flavor", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [{ - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - }] - }, - { - "related-to": "image", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [{ - "property-key": "image.image-name", - "property-value": "unknown" - }] - }] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299672", - "is-closed-loop-disabled": false - }], - "resource-version": "1527638176989", - "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", - "vf-modules": { - "vf-module": [{ - "vf-module-name": "vPacketGen-VNF-1128-3", - "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", - "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", - "resource-version": "1527641224058", - "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", - "is-base-vf-module": true, - "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", - "module-index": 0, - "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", - "orchestration-status": "active" - }] - }, - "vserver": [{ - "vserver-name": "Firewall-1", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" - }], - "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", - "vnf-name": "PacketGenerator-1", - "is-closed-loop-disabled": false - }, - { - "nf-role": "", - "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b9", - "relationship-list": { - "relationship": [{ - "related-to": "service-instance", - "relationship-data": [{ - "relationship-value": "Demonstration", - "relationship-key": "customer.global-customer-id" - }, - { - "relationship-value": "vFWCL", - "relationship-key": "service-subscription.service-type" - }, - { - "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", - "relationship-key": "service-instance.service-instance-id" - }], - "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", - "related-to-property": [{ - "property-key": "service-instance.service-instance-name", - "property-value": "Firewall1" - }] - }, - { - "related-to": "l3-network", - "relationship-data": [{ - "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", - "relationship-key": "l3-network.network-id" - }], - "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951871", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-to-property": [{ - "property-key": "l3-network.network-name", - "property-value": "HNPORTALOAM.OAM" - }] - }, - { - "related-to": "vserver", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "b49b830686654191bb1e952a74b014ad", - "relationship-key": "tenant.tenant-id" - }, - { - "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", - "relationship-key": "vserver.vserver-id" - }], - "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b" - }] - }, - "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df69", - "nf-type": "", - "l3-networks": [{ - "network-role": "HNPORTALOAM.OAM", - "network-technology": "ovs", - "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", - "network-id": "HNP1d77c-1222-41ec-b7f3-94bb30951870", - "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", - "is-external-network": false, - "is-bound-to-vpn": false, - "is-provider-network": false, - "network-type": "OVS_PROVIDER_VLAN", - "orchestration-status": "active", - "network-role-instance": 0, - "resource-version": "1526558298075", - "network-name": "HNPORTALOAM.OAM", - "is-shared-network": false - }], - "prov-status": "PREPROV", - "vnf-type": "vFW-vSINK-service/vPKG 0", - "orchestration-status": "Created", - "nf-naming-code": "", - "in-maint": false, - "nf-function": "", - "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", - "vservers": [{ - "relationship-list": { - "relationship": [{ - "related-to": "generic-vnf", - "relationship-data": [{ - "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", - "relationship-key": "generic-vnf.vnf-id" - }], - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", - "related-to-property": [{ - "property-key": "generic-vnf.vnf-name", - "property-value": "Firewall-1" - }] - }, - { - "related-to": "flavor", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", - "relationship-key": "flavor.flavor-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", - "related-to-property": [{ - "property-key": "flavor.flavor-name", - "property-value": "m1.medium" - }] - }, - { - "related-to": "image", - "relationship-data": [{ - "relationship-value": "CloudOwner", - "relationship-key": "cloud-region.cloud-owner" - }, - { - "relationship-value": "RegionOne", - "relationship-key": "cloud-region.cloud-region-id" - }, - { - "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "relationship-key": "image.image-id" - }], - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", - "related-to-property": [{ - "property-key": "image.image-name", - "property-value": "unknown" - }] - }] - }, - "in-maint": false, - "resource-version": "1528481820321", - "vserver-name": "Firewall-0", - "prov-status": "ACTIVE", - "vserver-id": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b", - "vserver-name2": "Firewall-0", - "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", - "is-closed-loop-disabled": false - }], - "resource-version": "1527638176989", - "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", - "vf-modules": { - "vf-module": [{ - "vf-module-name": "vPacketGen-VNF-1128-3", - "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", - "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", - "resource-version": "1527641224058", - "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", - "is-base-vf-module": true, - "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", - "module-index": 0, - "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", - "orchestration-status": "active" - }] - }, - "vserver": [{ - "vserver-name": "Firewall-1", - "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" - }], - "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", - "vnf-name": "PacketGenerator-2", - "is-closed-loop-disabled": false - }], - "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f", - "service-instance-name": "Firewall1" -} \ No newline at end of file diff --git a/src/test/resources/junit/serviceDecompositionResponse-1.json b/src/test/resources/junit/serviceDecompositionResponse-1.json new file mode 100644 index 0000000..3303e26 --- /dev/null +++ b/src/test/resources/junit/serviceDecompositionResponse-1.json @@ -0,0 +1,461 @@ +{ + "relationship-list": { + "relationship": [{ + "related-to": "generic-vnf", + "relationship-data": [{ + "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df68", + "relationship-key": "generic-vnf.vnf-id" + }], + "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df68", + "related-to-property": [{ + "property-key": "generic-vnf.vnf-name", + "property-value": "PacketGenerator-1" + }] + }, + { + "related-to": "generic-vnf", + "relationship-data": [{ + "relationship-value": "6700c313-fbb7-4cf9-ac70-0293ec56df69", + "relationship-key": "generic-vnf.vnf-id" + }], + "related-link": "/aai/v13/network/generic-vnfs/generic-vnf/6700c313-fbb7-4cf9-ac70-0293ec56df69", + "related-to-property": [{ + "property-key": "generic-vnf.vnf-name", + "property-value": "PacketGenerator-2" + }] + }] + }, + "model-version-id": "d3d6cf83-d03a-43cc-99ff-206d40bb9a72", + "service-instance-id": "c6456519-6acf-4adb-997c-3c363dd4caaf", + "resource-version": "1527637758480", + "generic-vnfs": [{ + "nf-role": "", + "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b7", + "relationship-list": { + "relationship": [{ + "related-to": "service-instance", + "relationship-data": [{ + "relationship-value": "Demonstration", + "relationship-key": "customer.global-customer-id" + }, + { + "relationship-value": "vFWCL", + "relationship-key": "service-subscription.service-type" + }, + { + "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", + "relationship-key": "service-instance.service-instance-id" + }], + "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", + "related-to-property": [{ + "property-key": "service-instance.service-instance-name", + "property-value": "Firewall1" + }] + }, + { + "related-to": "l3-network", + "relationship-data": [{ + "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", + "relationship-key": "l3-network.network-id" + }], + "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951870", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-to-property": [{ + "property-key": "l3-network.network-name", + "property-value": "HNPORTALOAM.OAM" + }] + }, + { + "related-to": "vserver", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "b49b830686654191bb1e952a74b014ad", + "relationship-key": "tenant.tenant-id" + }, + { + "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", + "relationship-key": "vserver.vserver-id" + }], + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299671" + }, + { + "related-to": "vserver", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "b49b830686654191bb1e952a74b014ad", + "relationship-key": "tenant.tenant-id" + }, + { + "relationship-value": "25fb07ab-0478-465e-a021-6384ac299672", + "relationship-key": "vserver.vserver-id" + }], + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/25fb07ab-0478-465e-a021-6384ac299672" + }] + }, + "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df68", + "nf-type": "", + "l3-networks": [{ + "network-role": "HNPORTALOAM.OAM", + "network-technology": "ovs", + "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", + "network-id": "HNP1d77c-1222-41ec-b7f3-94bb30951870", + "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "OVS_PROVIDER_VLAN", + "orchestration-status": "active", + "network-role-instance": 0, + "resource-version": "1526558298075", + "network-name": "HNPORTALOAM.OAM", + "is-shared-network": false + }], + "prov-status": "PREPROV", + "vnf-type": "vFW-vSINK-service/vPKG 0", + "orchestration-status": "Created", + "nf-naming-code": "", + "in-maint": false, + "nf-function": "", + "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", + "vservers": [{ + "relationship-list": { + "relationship": [{ + "related-to": "generic-vnf", + "relationship-data": [{ + "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", + "relationship-key": "generic-vnf.vnf-id" + }], + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", + "related-to-property": [{ + "property-key": "generic-vnf.vnf-name", + "property-value": "Firewall-1" + }] + }, + { + "related-to": "flavor", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", + "relationship-key": "flavor.flavor-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", + "related-to-property": [{ + "property-key": "flavor.flavor-name", + "property-value": "m1.medium" + }] + }, + { + "related-to": "image", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "relationship-key": "image.image-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "related-to-property": [{ + "property-key": "image.image-name", + "property-value": "unknown" + }] + }] + }, + "in-maint": false, + "resource-version": "1528481820321", + "vserver-name": "Firewall-0", + "prov-status": "ACTIVE", + "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", + "vserver-name2": "Firewall-0", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", + "is-closed-loop-disabled": false + }, + { + "relationship-list": { + "relationship": [{ + "related-to": "generic-vnf", + "relationship-data": [{ + "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", + "relationship-key": "generic-vnf.vnf-id" + }], + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", + "related-to-property": [{ + "property-key": "generic-vnf.vnf-name", + "property-value": "Firewall-1" + }] + }, + { + "related-to": "flavor", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", + "relationship-key": "flavor.flavor-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", + "related-to-property": [{ + "property-key": "flavor.flavor-name", + "property-value": "m1.medium" + }] + }, + { + "related-to": "image", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "relationship-key": "image.image-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "related-to-property": [{ + "property-key": "image.image-name", + "property-value": "unknown" + }] + }] + }, + "in-maint": false, + "resource-version": "1528481820321", + "vserver-name": "Firewall-0", + "prov-status": "ACTIVE", + "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", + "vserver-name2": "Firewall-0", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299672", + "is-closed-loop-disabled": false + }], + "resource-version": "1527638176989", + "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", + "vf-modules": { + "vf-module": [{ + "vf-module-name": "vPacketGen-VNF-1128-3", + "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", + "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", + "resource-version": "1527641224058", + "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", + "is-base-vf-module": true, + "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", + "module-index": 0, + "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", + "orchestration-status": "active" + }] + }, + "vserver": [{ + "vserver-name": "Firewall-1", + "vserver-id": "25fb07ab-0478-465e-a021-6384ac299671", + "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" + }], + "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", + "vnf-name": "PacketGenerator-1", + "is-closed-loop-disabled": false + }, + { + "nf-role": "", + "service-id": "8ea56b0d-459d-4668-b363-c9567432d8b9", + "relationship-list": { + "relationship": [{ + "related-to": "service-instance", + "relationship-data": [{ + "relationship-value": "Demonstration", + "relationship-key": "customer.global-customer-id" + }, + { + "relationship-value": "vFWCL", + "relationship-key": "service-subscription.service-type" + }, + { + "relationship-value": "c6456519-6acf-4adb-997c-3c363dd4caaf", + "relationship-key": "service-instance.service-instance-id" + }], + "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/c6456519-6acf-4adb-997c-3c363dd4caaf", + "related-to-property": [{ + "property-key": "service-instance.service-instance-name", + "property-value": "Firewall1" + }] + }, + { + "related-to": "l3-network", + "relationship-data": [{ + "relationship-value": "HNP1d77c-1094-41ec-b7f3-94bb30951870", + "relationship-key": "l3-network.network-id" + }], + "related-link": "/aai/v13/network/l3-networks/l3-network/HNP1d77c-1094-41ec-b7f3-94bb30951871", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-to-property": [{ + "property-key": "l3-network.network-name", + "property-value": "HNPORTALOAM.OAM" + }] + }, + { + "related-to": "vserver", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "b49b830686654191bb1e952a74b014ad", + "relationship-key": "tenant.tenant-id" + }, + { + "relationship-value": "25fb07ab-0478-465e-a021-6384ac299671", + "relationship-key": "vserver.vserver-id" + }], + "related-link": "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/b49b830686654191bb1e952a74b014ad/vservers/vserver/b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b" + }] + }, + "vnf-id": "6700c313-fbb7-4cf9-ac70-0293ec56df69", + "nf-type": "", + "l3-networks": [{ + "network-role": "HNPORTALOAM.OAM", + "network-technology": "ovs", + "service-id": "V7611HNP-1222-48f1-8085-94aef0c6ef3d51870", + "network-id": "01e8d84a-17a6-47b5-a167-6a45d1d56603", + "neutron-network-id": "491c7cef-a3f4-4990-883e-b0af397466d0", + "is-external-network": false, + "is-bound-to-vpn": false, + "is-provider-network": false, + "network-type": "OVS_PROVIDER_VLAN", + "orchestration-status": "active", + "network-role-instance": 0, + "resource-version": "1526558298075", + "network-name": "HNPORTALOAM.OAM", + "is-shared-network": false + }], + "prov-status": "PREPROV", + "vnf-type": "vFW-vSINK-service/vPKG 0", + "orchestration-status": "Created", + "nf-naming-code": "", + "in-maint": false, + "nf-function": "", + "model-version-id": "a5565bf4-d55a-4964-8fbc-6a7674a2e676", + "vservers": [{ + "relationship-list": { + "relationship": [{ + "related-to": "generic-vnf", + "relationship-data": [{ + "relationship-value": "8a9ddb25-2e79-449c-a40d-5011bac0da39", + "relationship-key": "generic-vnf.vnf-id" + }], + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a9ddb25-2e79-449c-a40d-5011bac0da39", + "related-to-property": [{ + "property-key": "generic-vnf.vnf-name", + "property-value": "Firewall-1" + }] + }, + { + "related-to": "flavor", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39", + "relationship-key": "flavor.flavor-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39", + "related-to-property": [{ + "property-key": "flavor.flavor-name", + "property-value": "m1.medium" + }] + }, + { + "related-to": "image", + "relationship-data": [{ + "relationship-value": "CloudOwner", + "relationship-key": "cloud-region.cloud-owner" + }, + { + "relationship-value": "RegionOne", + "relationship-key": "cloud-region.cloud-region-id" + }, + { + "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "relationship-key": "image.image-id" + }], + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b", + "related-to-property": [{ + "property-key": "image.image-name", + "property-value": "unknown" + }] + }] + }, + "in-maint": false, + "resource-version": "1528481820321", + "vserver-name": "Firewall-0", + "prov-status": "ACTIVE", + "vserver-id": "b494cd6e-b9f3-45e0-afe7-e1d1a5f5d74b", + "vserver-name2": "Firewall-0", + "vserver-selflink": "http://10.12.25.2:8774/v2.1/b49b830686654191bb1e952a74b014ad/servers/25fb07ab-0478-465e-a021-6384ac299671", + "is-closed-loop-disabled": false + }], + "resource-version": "1527638176989", + "model-customization-id": "4cc1e555-361f-4d69-ae21-9f371ea9f40c", + "vf-modules": { + "vf-module": [{ + "vf-module-name": "vPacketGen-VNF-1128-3", + "model-version-id": "d6d4a002-a584-4640-bdce-a50e9bce552b", + "heat-stack-id": "vPacketGen-VNF-1128-3/df34f5d6-ed39-4184-b785-51c37cfa8ac2", + "resource-version": "1527641224058", + "model-customization-id": "49c8f521-e5ee-4095-bb87-4090166e49ab", + "is-base-vf-module": true, + "vf-module-id": "0f792076-f5b3-4251-9fcc-c4d5afae0eb1", + "module-index": 0, + "model-invariant-id": "2a8844a8-f5f7-46dd-a732-472c6972a28e", + "orchestration-status": "active" + }] + }, + "vserver": [{ + "vserver-name": "Firewall-1", + "vserver-id": "25fb07ab-0478-465e-a021-6384ac299672", + "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f" + }], + "model-invariant-id": "99f1fd3f-845c-48f5-a0ba-11fbde6ae557", + "vnf-name": "PacketGenerator-2", + "is-closed-loop-disabled": false + }], + "model-invariant-id": "0c5a20de-87ad-442c-9190-f38ab0a6bb7f", + "service-instance-name": "Firewall1" +} \ No newline at end of file -- cgit 1.2.3-korg