Removing etsi-sol003-adapter module

Change-Id: If35f94bd8459c08c11d5e178ae872f70a36fd9fa Issue-ID: SO-3486 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
author: waqas.ikram <waqas.ikram@est.tech> 2021-02-19 09:18:44 +0000
committer: waqas.ikram <waqas.ikram@est.tech> 2021-02-19 11:38:51 +0000
commit: f8e38b54b043d358114a6752a19b95183522abe9 (patch)
tree: a103179fc41e261cb57d20637eb8748bc068b2d9 /adapters
parent: 92f39dea69eac0ddb4e61cf716bdf248d1fa5e44 (diff)
121 files changed, 0 insertions, 38285 deletions
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/Readme.txt b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/Readme.txt
deleted file mode 100644
index aaad60320d..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/Readme.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-The following describes how to configure authentication for the VNFM adapter.
-
-TLS should always be configured to ensure secure communication between the VNFM-adapter <-> BPMN infra and VNFM-adapter <-> VNFM
-If two-way TLS is configured then there is no need for any further authentication (i.e. no need for token or basic auth).
-If two-way TLS is NOT configured then authentication is REQUIRED. Oauth token based authentication must be used for requests, while for notifications either oauth tokens or basic auth can be used.
-
-
-==========================================
-To confgure TLS
-==========================================
-
----------------
-VNFM Adapter
----------------
-The following parameters can be set to configure the certificate for the VNFM adapter
-server:
-  ssl:
-    key-alias: so@so.onap.org
-    key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L'
-    key-store: classpath:so-vnfm-adapter.p12
-    key-store-type: PKCS12
-The values shown above relate to the certificate included in the VNFM adapter jar which has been generated from AAF. If a different certificate is to be used then these values should be changed accordingly.
-
-The following paramters can be set to configure the trust store for the VNFM adapter:
-http:
-  client:
-    ssl:
-      trust-store: classpath:org.onap.so.trust.jks
-      trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H'
-The values shown above relate to the trust store included in the VNFM adapter jar which has been generated from AAI. If a different trust store is to be used then these values should be changed accordingly.
-
-Ensure the value for the below parameter uses https instead of http
-vnfmadapter:
-  endpoint: http://so-vnfm-adapter.onap:9092
-  
----------------
-bpmn-infra
----------------
-For bpmn-infra, ensure the value for the below parameter uses https instead of http
-so:
-  vnfm:
-    adapter:
-      url: https://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/
-
-
-==========================================
-To use two way TLS
-==========================================
-
-Ensure the value for username and password are empty in the AAI entry for the VNFM (The VNFM adapter will use oauth instead of two way TLS if the username/password is set).
-Ensure TLS has been configuered as detailed above.
-
----------------
-VNFM adapter
----------------
-Set the following parameter for the VNFM adapter:
-server:
-  ssl:
-    client-auth: need
-	
----------------
-bpmn-infra:
----------------
-Set the following paramters for bpmn-infra:
-rest:
-  http:
-    client:
-      configuration:
-        ssl:
-          keyStore: classpath:org.onap.so.p12
-          keyStorePassword: 'RLe5ExMWW;Kd6GTSt0WQz;.Y'
-          trustStore: classpath:org.onap.so.trust.jks
-          trustStorePassword: '6V%8oSU$,%WbYp3IUe;^mWt4'
-Ensure the value for the below parameter uses https instead of http
-so:
-  vnfm:
-    adapter:
-      url: https://so-vnfm-adapter.onap:9092/so/vnfm-adapter/v1/
-	  
----------------	  
-VNFM simulator:
----------------
-Set the following parameters for the VNFM simulator (if used):
-server:
-  ssl:
-    client-auth: need
-  request:
-    grant:
-      auth: twowaytls
-
-==========================================
-To use oauth token base authentication
-==========================================
-
----------------	  
-VNFM adapter:
----------------
-Ensure the value for username and password set set in the AAI entry for the VNFM. The VNFM adapter will use this username/password as the client credentials in the request for a token for the VNFM. The token endpoint
-for the VNFM will by default will be derived from the service url for the VNFM in AAI as follows: <base of service url>/oauth/token, e.g. if the service url is https://so-vnfm-simulator.onap/vnflcm/v1 then the token url will
-be taken to be https://so-vnfm-simulator.onap/oauth/token. This can be overriden using the following parameter for the VNFM adapter:
-vnfmadapter:
-  temp:
-    vnfm:
-	  oauth:
-	    endpoint:
-		
-The VNFM adapter exposes a token point at url: https://<hostname>:<port>/oauth/token e.g. https://so-vnfm-adapter.onap:9092/oauth/token. The VNFM can request a token from this endpoint for use in grant requests and notifications
-to the VNFM adapter. The username/password to be used in the token request are passed to the VNFM in a subscription request. The username/password sent by the VNFM adpater in the subscription request can be configuered using the 
-following parameter:
-vnfmadapter:
-  auth: <encoded value>
-where <encoded value> is '<username>:<password>' encoded using org.onap.so.utils.CryptoUtils with the key set by the paramter:
-mso:
-  key: <key>
-The default username:password is vnfm-adapter:123456 when vnfm-adapter.auth is not set.
-		  
----------------	  
-VNFM simulator:
----------------
-Set the following parameters for the simulator:
-spring:
-  profiles:
-    active: oauth-authentication
-server:
-  request:
-    grant:
-      auth: oauth
-		
-==========================================
-To use basic auth for notifications
-==========================================		
-The same username/password is used as for oauth token requests as describe above and passed to the VNFM in the subscription request.
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/pom.xml
deleted file mode 100644
index 7a93f6e23a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-adapter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-adapter-application</artifactId>
-  <name>ETSI SOL003 Application Jar</name>
-  <build>
-    <finalName>${project.artifactId}-${project.version}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <mainClass>org.onap.so.adapters.etsisol003adapter.Application</mainClass>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>original</id>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <so.log.level>DEBUG</so.log.level>
-          </systemPropertyVariables>
-          <rerunFailingTestsCount>2</rerunFailingTestsCount>
-          <parallel>suites</parallel>
-          <useUnlimitedThreads>false</useUnlimitedThreads>
-          <threadCount>1</threadCount>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <excludes>
-          <exclude>**/*.p12</exclude>
-          <exclude>**/*.jks</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>false</filtering>
-        <includes>
-          <include>**/*.p12</include>
-          <include>**/*.jks</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-lcm-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-pkgm-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/Application.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/Application.java
deleted file mode 100755
index 261d2244d7..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/Application.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.EtsiSol003AdapterController;
-import org.slf4j.Logger;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.cache.annotation.EnableCaching;
-
-/**
- * The spring boot application for the ETSI SOL003 Adapter.
- * <p>
- * The ETSI SOL003 Adapter receives requests through its REST API {@link EtsiSol003AdapterController} which it adapts
- * into ETSI SOL003 compliant LCM (Life Cycle Management) calls towards an ETSI compliant VNFM.
- *
- * @see <a href= "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf">ETSI
- *      SOL003 v2.5.1</a>
- */
-@EnableCaching
-@SpringBootApplication(scanBasePackages = {"org.onap.so"})
-@EnableAutoConfiguration(exclude = {JacksonAutoConfiguration.class})
-public class Application {
-    private static final Logger logger = getLogger(Application.class);
-
-    /**
-     * Entry point for the Spring boot application
-     *
-     * @param args arguments for the application
-     */
-    public static void main(final String[] args) {
-        new SpringApplication(Application.class).run(args);
-        logger.info("VnfmAdapterApplication started!");
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/EtsiSol003AdapterBasicHttpSecurityConfigurer.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/EtsiSol003AdapterBasicHttpSecurityConfigurer.java
deleted file mode 100644
index 618b4f6116..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/java/org/onap/so/adapters/etsisol003adapter/EtsiSol003AdapterBasicHttpSecurityConfigurer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.so.adapters.etsisol003adapter;
-
-import org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants;
-import org.onap.so.security.HttpSecurityConfigurer;
-import org.onap.so.security.SoUserCredentialConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Primary;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Primary
-@Component
-public class EtsiSol003AdapterBasicHttpSecurityConfigurer implements HttpSecurityConfigurer {
-
-    @Autowired
-    private SoUserCredentialConfiguration soUserCredentialConfiguration;
-
-    @Value("${server.ssl.client-auth:none}")
-    private String clientAuth;
-
-    @Override
-    public void configure(final HttpSecurity http) throws Exception {
-        if (("need").equalsIgnoreCase(clientAuth)) {
-            http.csrf().disable().authorizeRequests().anyRequest().permitAll();
-        } else {
-            http.csrf().disable().authorizeRequests().antMatchers("/manage/health", "/manage/info").permitAll()
-                    .antMatchers(HttpMethod.GET, CommonConstants.ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL).permitAll()
-                    .antMatchers("/**")
-                    .hasAnyRole(StringUtils.collectionToDelimitedString(soUserCredentialConfiguration.getRoles(), ","))
-                    .and().httpBasic();
-        }
-    }
-}
-
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-aaf.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-aaf.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-aaf.yaml
+++ /dev/null
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-basic.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-basic.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application-basic.yaml
+++ /dev/null
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application.yaml
deleted file mode 100644
index 57dc08f3b5..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/application.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright © 2019 Nordix Foundation
-#
-# 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.
-spring:
-  security:
-    usercredentials:
-      - username: test
-        password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu'
-        role: BPEL-Client
-      - username: vnfm
-        password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-        role: BPEL-Client
-  http:
-    converters:
-    preferred-json-mapper: gson
-  main:
-    allow-bean-definition-overriding: true
-     
-server:
-  port: 9092
-  tomcat:
-    max-threads: 50
-
-mso:
-  key: 07a7159d3bf51a0e53be7a8f89699be7
-
-aai:
-  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
-  version: v15
-  endpoint: https://aai.onap:8443
-
-sdc:
-  username: sdcUser
-  password: sdcPassword
-  key: adadadadad
-  endpoint: http://sdc.onap/1234A
-  
-vnfmadapter:
-  endpoint: http://so-vnfm-adapter.onap:9092
-
-#Actuator
-management:
-  endpoints:
-    web:
-      base-path: /manage
-      exposure:
-        include: "*"
-  metrics:
-    se-global-registry: false
-    export:
-      prometheus:
-        enabled: true # Whether exporting of metrics to Prometheus is enabled.
-        step: 1m # Step size (i.e. reporting frequency) to use.
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/org.onap.so.trust.jks b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/org.onap.so.trust.jks
deleted file mode 100644
index 4605a24f4c..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/org.onap.so.trust.jks
+++ /dev/null
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/so-vnfm-adapter.p12 b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/so-vnfm-adapter.p12
deleted file mode 100644
index 6bd786d596..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-application/src/main/resources/so-vnfm-adapter.p12
+++ /dev/null
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/pom.xml
deleted file mode 100644
index 9f46f4711a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-adapter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-adapter-common</artifactId>
-  <name>ETSI SOL003 Adapter Common</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.security.oauth</groupId>
-      <artifactId>spring-security-oauth2</artifactId>
-      <version>${spring-security-oauth2-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/CommonConstants.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/CommonConstants.java
deleted file mode 100644
index dbe4dac321..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/CommonConstants.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsi.sol003.adapter.common;
-
-/**
- * VNFM Adapter Common constants
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-public class CommonConstants {
-
-    public static final String SERVICE_NAME = "vnfm-adapter";
-    public static final String SERVICE_VERSION = "v1";
-    public static final String BASE_URL = "/so/" + SERVICE_NAME + "/" + SERVICE_VERSION;
-
-    public static final String PACKAGE_MANAGEMENT_BASE_URL = BASE_URL + "/vnfpkgm/v1";
-
-    public static final String ETSI_CATALOG_MANAGER_BASE_ENDPOINT = "/etsicatalogmanager";
-    public static final String ETSI_SUBSCRIPTION_NOTIFICATION_ENDPOINT = "/notification";
-    public static final String ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL =
-            BASE_URL + ETSI_CATALOG_MANAGER_BASE_ENDPOINT;
-    public static final String ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL =
-            ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL + ETSI_SUBSCRIPTION_NOTIFICATION_ENDPOINT;
-
-    public static final String OPERATION_NOTIFICATION_ENDPOINT = "/lcn/VnfLcmOperationOccurrenceNotification";
-
-    private CommonConstants() {}
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/VnfmAdapterUrlProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/VnfmAdapterUrlProvider.java
deleted file mode 100644
index 855b5a454f..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/VnfmAdapterUrlProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsi.sol003.adapter.common;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.BASE_URL;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.OPERATION_NOTIFICATION_ENDPOINT;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.PACKAGE_MANAGEMENT_BASE_URL;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.net.URI;
-import java.security.GeneralSecurityException;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.onap.so.utils.CryptoUtils;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-
-/**
- * Provides VNFM Adapter endpoint URLs
- * 
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Configuration
-public class VnfmAdapterUrlProvider {
-
-    private static final Logger logger = getLogger(VnfmAdapterUrlProvider.class);
-    private static final String COLON = ":";
-    private static final int LIMIT = 2;
-
-    private final String vnfmAdapterEndpoint;
-    private final String msoKeyString;
-    private final String vnfmAdapterAuth;
-
-    @Autowired
-    public VnfmAdapterUrlProvider(@Value("${vnfmadapter.endpoint}") final String vnfmAdapterEndpoint,
-            @Value("${mso.key}") final String msoKeyString,
-            @Value("${vnfmadapter.auth:BF29BA36F0CFE1C05507781F6B97EFBCA7EFAC9F595954D465FC43F646883EF585C20A58CBB02528A6FAAC}") final String vnfmAdapterAuth) {
-        this.vnfmAdapterEndpoint = vnfmAdapterEndpoint;
-        this.msoKeyString = msoKeyString;
-        this.vnfmAdapterAuth = vnfmAdapterAuth;
-    }
-
-    public String getEtsiSubscriptionNotificationBaseUrl() {
-        return vnfmAdapterEndpoint + ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL;
-    }
-
-    public URI getSubscriptionUri(final String subscriptionId) {
-        return URI.create(getSubscriptionUriString(subscriptionId));
-    }
-
-    public ImmutablePair<String, String> getDecryptAuth() throws GeneralSecurityException {
-        final String decryptedAuth = CryptoUtils.decrypt(vnfmAdapterAuth, msoKeyString);
-        final String[] auth = decryptedAuth.split(COLON, LIMIT);
-        if (auth.length > 1) {
-            return ImmutablePair.of(auth[0], auth[1]);
-        }
-        logger.error("Unexpected auth value: {}", vnfmAdapterAuth);
-        return ImmutablePair.nullPair();
-    }
-
-    public String getSubscriptionUriString(final String subscriptionId) {
-        return vnfmAdapterEndpoint + PACKAGE_MANAGEMENT_BASE_URL + "/subscriptions/" + subscriptionId;
-    }
-
-    public String getVnfLcmOperationOccurrenceNotificationUrl() {
-        return vnfmAdapterEndpoint + BASE_URL + OPERATION_NOTIFICATION_ENDPOINT;
-    }
-
-    public String getVnfPackageUrl(final String vnfPkgId) {
-        return vnfmAdapterEndpoint + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/" + vnfPkgId;
-    }
-
-    public String getVnfPackageVnfdUrl(final String vnfPkgId) {
-        return getVnfPackageUrl(vnfPkgId) + "/vnfd";
-    }
-
-    public String getVnfPackageContentUrl(final String vnfPkgId) {
-        return getVnfPackageUrl(vnfPkgId) + "/package_content";
-    }
-
-    public String getOauthTokenUrl() {
-        return vnfmAdapterEndpoint + "/oauth/token";
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/AbstractServiceProviderConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/AbstractServiceProviderConfiguration.java
deleted file mode 100644
index 6161fa60f9..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/AbstractServiceProviderConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsi.sol003.adapter.common.configuration;
-
-import java.util.Iterator;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.GsonHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * A base class that can be extended by classes for configuring HttpRestServiceProvider classes. Provides common methods
- * that will be useful to some such classes.
- *
- * @author gareth.roper@est.tech
- * @author Waqas Ikram (waqas.ikram@est.tech)
- */
-public abstract class AbstractServiceProviderConfiguration {
-
-    public void setGsonMessageConverter(final RestTemplate restTemplate) {
-        final Iterator<HttpMessageConverter<?>> iterator = restTemplate.getMessageConverters().iterator();
-        while (iterator.hasNext()) {
-            if (iterator.next() instanceof MappingJackson2HttpMessageConverter) {
-                iterator.remove();
-            }
-        }
-        restTemplate.getMessageConverters().add(new GsonHttpMessageConverter(getGson()));
-    }
-
-    protected abstract Gson getGson();
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/MessageConverterConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/MessageConverterConfiguration.java
deleted file mode 100644
index 25c37b9016..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/common/configuration/MessageConverterConfiguration.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsi.sol003.adapter.common.configuration;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import org.onap.so.adapters.etsi.sol003.adapter.oauth.configuration.OAuth2AccessTokenAdapter;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.GsonHttpMessageConverter;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-/**
- * Configures message converter
- */
-@Configuration
-public class MessageConverterConfiguration {
-
-    @Bean
-    public HttpMessageConverters customConverters() {
-        final Collection<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
-        final Gson gson = new GsonBuilder()
-                .registerTypeHierarchyAdapter(OAuth2AccessToken.class, new OAuth2AccessTokenAdapter()).create();
-        final GsonHttpMessageConverter gsonHttpMessageConverter = new GsonHttpMessageConverter(gson);
-        messageConverters.add(gsonHttpMessageConverter);
-        return new HttpMessageConverters(true, messageConverters);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/AuthorizationServerConfig.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/AuthorizationServerConfig.java
deleted file mode 100644
index 3a3287535e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/AuthorizationServerConfig.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsi.sol003.adapter.oauth.configuration;
-
-import org.onap.so.utils.CryptoUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
-
-@Configuration
-@EnableAuthorizationServer
-/**
- * Configures the authorization server for oauth token based authentication.
- */
-public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter {
-
-    private static final int ONE_DAY = 60 * 60 * 24;
-
-    @Value("${vnfmadapter.auth:E39823AAB2739CC654C4E92B52C05BC34149342D0A46451B00CA508C8EDC62242CE4E9DA9445D3C01A3F13}")
-    private String vnfmAdapterAuth;
-
-    @Value("${mso.key}")
-    private String msoEncryptionKey;
-
-    @Override
-    public void configure(final ClientDetailsServiceConfigurer clients) throws Exception {
-        final String[] decrypedAuth = CryptoUtils.decrypt(vnfmAdapterAuth, msoEncryptionKey).split(":");
-        final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        clients.inMemory().withClient(decrypedAuth[0]).secret(passwordEncoder.encode(decrypedAuth[1]))
-                .authorizedGrantTypes("client_credentials").scopes("write").accessTokenValiditySeconds(ONE_DAY)
-                .refreshTokenValiditySeconds(ONE_DAY);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2AccessTokenAdapter.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2AccessTokenAdapter.java
deleted file mode 100644
index 4be5b8a86a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2AccessTokenAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsi.sol003.adapter.oauth.configuration;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import java.lang.reflect.Type;
-import org.springframework.security.oauth2.common.OAuth2AccessToken;
-
-public class OAuth2AccessTokenAdapter implements JsonSerializer<OAuth2AccessToken> {
-
-    @Override
-    public JsonElement serialize(final OAuth2AccessToken src, final Type typeOfSrc,
-            final JsonSerializationContext context) {
-        final JsonObject obj = new JsonObject();
-        obj.addProperty(OAuth2AccessToken.ACCESS_TOKEN, src.getValue());
-        obj.addProperty(OAuth2AccessToken.TOKEN_TYPE, src.getTokenType());
-        if (src.getRefreshToken() != null) {
-            obj.addProperty(OAuth2AccessToken.REFRESH_TOKEN, src.getRefreshToken().getValue());
-        }
-        obj.addProperty(OAuth2AccessToken.EXPIRES_IN, src.getExpiresIn());
-        final JsonArray scopeObj = new JsonArray();
-        for (final String scope : src.getScope()) {
-            scopeObj.add(scope);
-        }
-        obj.add(OAuth2AccessToken.SCOPE, scopeObj);
-
-        return obj;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2ResourceServer.java b/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2ResourceServer.java
deleted file mode 100644
index 2dcfea4045..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-adapter-common/src/main/java/org/onap/so/adapters/etsi/sol003/adapter/oauth/configuration/OAuth2ResourceServer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsi.sol003.adapter.oauth.configuration;
-
-import javax.servlet.http.HttpServletRequest;
-import org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
-import org.springframework.security.web.util.matcher.RequestMatcher;
-
-@Configuration
-@EnableResourceServer
-/**
- * Enforces oauth token based authentication when a token is provided in the request.
- */
-public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
-
-    @Override
-    public void configure(final HttpSecurity http) throws Exception {
-        http.requestMatcher(new OAuth2ResourceServerRequestMatcher()).authorizeRequests()
-                .antMatchers(CommonConstants.BASE_URL + "/grants/**", CommonConstants.BASE_URL + "/lcn/**")
-                .authenticated();
-    }
-
-    private static class OAuth2ResourceServerRequestMatcher implements RequestMatcher {
-        @Override
-        public boolean matches(HttpServletRequest request) {
-            String auth = request.getHeader("Authorization");
-            String uri = request.getRequestURI();
-            return (auth != null && auth.startsWith("Bearer") && (uri.contains("/grants") || uri.contains("/lcn/")));
-        }
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
deleted file mode 100644
index be84bc74ef..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-lcm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-lcm-adapter</artifactId>
-  <name>ETSI SOL003 Life Cycle Management Adapter</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <so.log.level>DEBUG</so.log.level>
-          </systemPropertyVariables>
-          <rerunFailingTestsCount>2</rerunFailingTestsCount>
-          <parallel>suites</parallel>
-          <useUnlimitedThreads>false</useUnlimitedThreads>
-          <threadCount>1</threadCount>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-tomcat</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-adapter-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-lcm-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-lcm-ext-clients</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.inject</groupId>
-      <artifactId>jersey-hk2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-pkgm-adapter</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/LifeCycleManagementConstants.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/LifeCycleManagementConstants.java
deleted file mode 100644
index d9804072b7..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/LifeCycleManagementConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm;
-
-/**
- * ETSI SOL003 Life Cycle Management Adapter constants
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- */
-public class LifeCycleManagementConstants {
-
-    public static final String OPERATION_NOTIFICATION_ENDPOINT = "/lcn/VnfLcmOperationOccurrenceNotification";
-
-    private LifeCycleManagementConstants() {}
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/NvfmAdapterUtils.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/NvfmAdapterUtils.java
deleted file mode 100644
index 367d8b244f..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/NvfmAdapterUtils.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.ArrayList;
-import java.util.Collection;
-import org.slf4j.Logger;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-public final class NvfmAdapterUtils {
-    private static Logger logger = getLogger(NvfmAdapterUtils.class);
-
-    private NvfmAdapterUtils() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    public static JsonObject child(final JsonObject parent, final String name) {
-        return childElement(parent, name).getAsJsonObject();
-    }
-
-    public static JsonElement childElement(final JsonObject parent, final String name) {
-        final JsonElement child = parent.get(name);
-        if (child == null) {
-            throw abortOperation("Missing child " + name);
-        }
-        return child;
-    }
-
-    public static Collection<JsonObject> children(final JsonObject parent) {
-        final ArrayList<JsonObject> childElements = new ArrayList<>();
-        for (final String childKey : parent.keySet()) {
-            if (parent.get(childKey).isJsonObject()) {
-                childElements.add(parent.get(childKey).getAsJsonObject());
-            }
-        }
-        return childElements;
-    }
-
-    public static RuntimeException abortOperation(final String msg, final Exception e) {
-        logger.error(msg, e);
-        return new RuntimeException(msg, e);
-    }
-
-    public static RuntimeException abortOperation(final String msg) {
-        logger.error(msg);
-        return new RuntimeException(msg);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/EtsiPackageProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/EtsiPackageProvider.java
deleted file mode 100644
index ec46af45cd..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/EtsiPackageProvider.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- *  Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients;
-
-import static com.google.common.base.Splitter.on;
-import static com.google.common.collect.Iterables.filter;
-import static org.onap.so.adapters.etsisol003adapter.lcm.NvfmAdapterUtils.abortOperation;
-import static org.onap.so.adapters.etsisol003adapter.lcm.NvfmAdapterUtils.child;
-import static org.onap.so.adapters.etsisol003adapter.lcm.NvfmAdapterUtils.childElement;
-import static org.onap.so.adapters.etsisol003adapter.lcm.NvfmAdapterUtils.children;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProviderImpl;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.EtsiCatalogManagerRequestFailureException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
-import com.google.common.io.ByteStreams;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-@Component
-public class EtsiPackageProvider {
-    private static final String TOCSA_METADATA_FILE_PATH = "TOSCA-Metadata/TOSCA.meta";
-    private static final String TOSCA_VNFD_KEY = "Entry-Definitions";
-    private static Logger logger = getLogger(EtsiPackageProvider.class);
-
-    @Autowired
-    private EtsiCatalogServiceProviderImpl etsiCatalogServiceProviderImpl;
-
-    public String getVnfdId(final String csarId) {
-        return getVnfNodeProperty(csarId, "descriptor_id");
-    }
-
-    private String getVnfNodeProperty(final String csarId, final String propertyName) {
-        logger.debug("Getting {} from {}", propertyName, csarId);
-        final byte[] onapPackage = getPackage(csarId);
-
-        try {
-            final String vnfdLocation = getVnfdLocation(new ByteArrayInputStream(onapPackage));
-            final String onapVnfdContent = getFileInZip(new ByteArrayInputStream(onapPackage), vnfdLocation).toString();
-            logger.debug("VNFD CONTENTS: {}", onapVnfdContent);
-            final JsonObject root = new Gson().toJsonTree(new Yaml().load(onapVnfdContent)).getAsJsonObject();
-
-            final JsonObject topologyTemplates = child(root, "topology_template");
-            final JsonObject nodeTemplates = child(topologyTemplates, "node_templates");
-            for (final JsonObject child : children(nodeTemplates)) {
-                final String type = childElement(child, "type").getAsString();
-                String propertyValue = null;
-                if ("tosca.nodes.nfv.VNF".equals(type)) {
-                    final JsonObject properties = child(child, "properties");
-                    logger.debug("properties: {}", properties);
-                    propertyValue = properties.get(propertyName).getAsJsonPrimitive().getAsString();
-                    if (propertyValue == null) {
-                        propertyValue = getValueFromNodeTypeDefinition(root, type, propertyName);
-                    }
-                    return propertyValue;
-                }
-
-            }
-
-        } catch (final Exception e) {
-            throw new IllegalArgumentException("Unable to extract " + propertyName + " from ONAP package", e);
-        }
-        throw new IllegalArgumentException("Unable to extract " + propertyName + " from ONAP package");
-    }
-
-    private String getValueFromNodeTypeDefinition(final JsonObject root, final String nodeTypeName,
-            final String propertyName) {
-        final JsonObject nodeTypes = child(root, "node_types");
-        final JsonObject nodeType = child(nodeTypes, nodeTypeName);
-
-        if ("tosca.nodes.nfv.VNF".equals(childElement(nodeType, "derived_from").getAsString())) {
-            final JsonObject properties = child(nodeType, "properties");
-            logger.debug("properties: {}", properties);
-            final JsonObject property = child(properties, propertyName);
-            logger.debug("property: {}", property);
-            logger.debug("property default: {}", childElement(property, "default"));
-            return childElement(property, "default").getAsJsonPrimitive().getAsString();
-        }
-        return null;
-    }
-
-    private byte[] getPackage(final String csarId) {
-        try {
-            final Optional<byte[]> optional = etsiCatalogServiceProviderImpl.getVnfPackageContent(csarId);
-            if (optional.isPresent()) {
-                return optional.get();
-            }
-        } catch (final Exception exception) {
-            logger.error("Unable to retrieve package from ETSI Catalog Manager using pkgId: {}", csarId);
-            throw new EtsiCatalogManagerRequestFailureException("Value is not present", exception);
-        }
-        logger.error("Unable to retrieve package from ETSI Catalog Manager using pkgId: {}", csarId);
-        throw new EtsiCatalogManagerRequestFailureException("Value is not present");
-    }
-
-    private String getVnfdLocation(final InputStream stream) throws IOException {
-        final String toscaMetadata = new String(getFileInZip(stream, TOCSA_METADATA_FILE_PATH).toByteArray());
-        if (!toscaMetadata.isEmpty()) {
-            final String toscaVnfdLine =
-                    filter(on("\n").split(toscaMetadata), line -> line.contains(TOSCA_VNFD_KEY)).iterator().next();
-            return toscaVnfdLine.replace(TOSCA_VNFD_KEY + ":", "").trim();
-        }
-        throw abortOperation("Unable to find valid Tosca Path");
-    }
-
-    private static ByteArrayOutputStream getFileInZip(final InputStream zip, final String path) throws IOException {
-        final ZipInputStream zipInputStream = new ZipInputStream(zip);
-        final ByteArrayOutputStream fileContent = getFileInZip(zipInputStream, path);
-        zipInputStream.close();
-        return fileContent;
-    }
-
-    private static ByteArrayOutputStream getFileInZip(final ZipInputStream zipInputStream, final String path)
-            throws IOException {
-        ZipEntry zipEntry;
-        final Set<String> items = new HashSet<>();
-        while ((zipEntry = zipInputStream.getNextEntry()) != null) {
-            items.add(zipEntry.getName());
-            if (zipEntry.getName().matches(path)) {
-                final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                ByteStreams.copy(zipInputStream, byteArrayOutputStream);
-                return byteArrayOutputStream;
-            }
-        }
-        logger.error("Unable to find the {} in archive found: {}", path, items);
-        throw new NoSuchElementException("Unable to find the " + path + " in archive found: " + items);
-    }
-
-    public String getFlavourId(final String csarId) {
-        return getVnfNodeProperty(csarId, "flavour_id");
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiClientProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiClientProvider.java
deleted file mode 100644
index 529be0eb2e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiClientProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AaiClientProvider {
-
-    @Bean
-    public AAIResourcesClient getAaiClient() {
-        return new AAIResourcesClient();
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiHelper.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiHelper.java
deleted file mode 100644
index 958d2ebca8..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiHelper.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.TenantNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * Provides helper methods for interactions with AAI.
- */
-@Service
-public class AaiHelper {
-
-    private static final Logger logger = LoggerFactory.getLogger(AaiHelper.class);
-    private final AaiServiceProvider aaiServiceProvider;
-    private final Map<String, OamIpAddressSource> mapOfVnfIdToOamIpAddressHolder = new HashMap<>();
-
-    @Autowired
-    public AaiHelper(final AaiServiceProvider aaiServiceProvider) {
-        this.aaiServiceProvider = aaiServiceProvider;
-    }
-
-    /**
-     * Get the VNFM assigned for use for the given generic VNF.
-     *
-     * @param vnf the generic VNF
-     * @return the VNFM to use, or <code>null</code> if no VNFM has been assigned yet
-     */
-    public EsrVnfm getAssignedVnfm(final GenericVnf vnf) {
-        final String vnfmId = getIdOfAssignedVnfm(vnf);
-        return vnfmId == null ? null : aaiServiceProvider.invokeGetVnfm(vnfmId);
-    }
-
-    /**
-     * Get the ID of the VNFM assigned for use for the given generic VNF.
-     *
-     * @param vnf the generic VNF
-     * @return the ID of the VNFM to use, or <code>null</code> if no VNFM has been assigned yet
-     */
-    public String getIdOfAssignedVnfm(final GenericVnf vnf) {
-        final Relationship relationship = getRelationship(vnf, "esr-vnfm");
-        return getRelationshipData(relationship, "esr-vnfm.vnfm-id");
-    }
-
-    /**
-     * Get the tenant assigned for use for the given generic VNF.
-     *
-     * @param vnf the generic VNF
-     * @return the tenant to use, or <code>null</code> if no tenant has been assigned yet
-     */
-    public Tenant getAssignedTenant(final GenericVnf vnf) {
-        final Relationship relationship = getRelationship(vnf, "tenant");
-        final String cloudOwner = getRelationshipData(relationship, "cloud-region.cloud-owner");
-        final String cloudRegion = getRelationshipData(relationship, "cloud-region.cloud-region-id");
-        final String tenantId = getRelationshipData(relationship, "tenant.tenant-id");
-        if (cloudOwner == null || cloudRegion == null || tenantId == null) {
-            throw new TenantNotFoundException("No matching Tenant found in AAI. VNFID: " + vnf.getVnfId());
-        } else {
-            return new Tenant().cloudOwner(cloudOwner).regionName(cloudRegion).tenantId(tenantId);
-        }
-    }
-
-    private Relationship getRelationship(final GenericVnf vnf, final String relationshipRelatedToValue) {
-        for (final Relationship relationship : vnf.getRelationshipList() == null ? Collections.<Relationship>emptyList()
-                : vnf.getRelationshipList().getRelationship()) {
-            if (relationship.getRelatedTo().equals(relationshipRelatedToValue)) {
-                return relationship;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the value of the relationship data with the given key in the given relationship.
-     *
-     * @param relationship the relationship
-     * @param relationshipDataKey the key for the relationship data
-     * @return the value of the relationship data for the given key
-     */
-    public String getRelationshipData(final Relationship relationship, final String relationshipDataKey) {
-        if (relationship != null) {
-            for (final RelationshipData relationshipData : relationship.getRelationshipData()) {
-                if (relationshipData.getRelationshipKey().equals(relationshipDataKey)) {
-                    return relationshipData.getRelationshipValue();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Delete from the given VNF the relationship matching the given criteria.
-     *
-     * @param vnf the VNF
-     * @param relationshipRelatedToValue the related-to value for the relationship
-     * @param dataKey the relationship data key to match on
-     * @param dataValue the value the relationship data with the given key must match
-     * @return the deleted relationship or <code>null</code> if none found matching the given criteria
-     */
-    public Relationship deleteRelationshipWithDataValue(final GenericVnf vnf, final String relationshipRelatedToValue,
-            final String dataKey, final String dataValue) {
-        final Iterator<Relationship> relationships =
-                vnf.getRelationshipList() == null ? Collections.<Relationship>emptyList().iterator()
-                        : vnf.getRelationshipList().getRelationship().iterator();
-
-        while (relationships.hasNext()) {
-            final Relationship relationship = relationships.next();
-            if (relationship.getRelatedTo().equals(relationshipRelatedToValue)
-                    && dataValue.equals(getRelationshipData(relationship, dataKey))) {
-                relationships.remove();
-                return relationship;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Select a VNFM to use for the given generic VNF. Should only be used when no VNFM has already been assigned to the
-     * VNF.
-     *
-     * @param vnf the generic VNF
-     * @return the VNFM to use
-     */
-    public EsrVnfm selectVnfm(final GenericVnf vnf) {
-        final EsrVnfmList vnfmsInEsr = aaiServiceProvider.invokeGetVnfms();
-
-        if (vnfmsInEsr == null) {
-            throw new VnfmNotFoundException("No VNFMs found in AAI ESR");
-        }
-        logger.debug("VNFMs in ESR: " + vnfmsInEsr);
-
-        for (final EsrVnfm vnfm : vnfmsInEsr.getEsrVnfm()) {
-            final EsrSystemInfoList systemInfolist =
-                    aaiServiceProvider.invokeGetVnfmEsrSystemInfoList(vnfm.getVnfmId());
-            vnfm.setEsrSystemInfoList(systemInfolist);
-            if (vnfmHasMatchingEsrSystemInfoType(vnfm, vnf.getNfType())) {
-                return vnfm;
-            }
-        }
-        throw new VnfmNotFoundException("No matching VNFM found in AAI ESR");
-    }
-
-    private boolean vnfmHasMatchingEsrSystemInfoType(final EsrVnfm vnfm, final String type) {
-        logger.debug("Checking VNFM ID: " + vnfm + ": " + vnfm.getVnfmId());
-
-        final EsrSystemInfoList systemInfolist = vnfm.getEsrSystemInfoList();
-        if (systemInfolist != null) {
-            for (final EsrSystemInfo esrSystemInfo : systemInfolist.getEsrSystemInfo()) {
-                if (esrSystemInfo.getType().equals(type)) {
-                    logger.debug("Matched VNFM ID: " + vnfm + ", based on type");
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Create a vserver.
-     *
-     * @param vnfc the VNFC to base the vserver on
-     * @return the vserver
-     */
-    public Vserver createVserver(final LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs vnfc) {
-        final Vserver vserver = new Vserver();
-        vserver.setVserverId(vnfc.getComputeResource().getResourceId());
-        vserver.setVserverName(vnfc.getId());
-        vserver.setProvStatus("active");
-        vserver.setVserverSelflink("Not available");
-        return vserver;
-    }
-
-    public void setOamIpAddressSource(final String vnfId, final OamIpAddressSource oamIpAddressSource) {
-        mapOfVnfIdToOamIpAddressHolder.put(vnfId, oamIpAddressSource);
-    }
-
-    public OamIpAddressSource getOamIpAddressSource(final String vnfId) {
-        return mapOfVnfIdToOamIpAddressHolder.get(vnfId);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiPropertiesImpl.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiPropertiesImpl.java
deleted file mode 100644
index 9e08cda354..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiPropertiesImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-import org.onap.aaiclient.client.aai.AAIProperties;
-import org.onap.aaiclient.client.aai.AAIVersion;
-import org.onap.so.spring.SpringContextHelper;
-import org.springframework.context.ApplicationContext;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class AaiPropertiesImpl implements AAIProperties {
-
-    private final String endpoint;
-    private final String encryptedBasicAuth;
-    private final String encrytptionKey;
-    private final String aaiVersion;
-
-    public AaiPropertiesImpl() {
-        final ApplicationContext context = SpringContextHelper.getAppContext();
-        this.endpoint = context.getEnvironment().getProperty("aai.endpoint");
-        this.encryptedBasicAuth = context.getEnvironment().getProperty("aai.auth");
-        this.encrytptionKey = context.getEnvironment().getProperty("mso.key");
-        this.aaiVersion = context.getEnvironment().getProperty("aai.version");
-
-    }
-
-    @Override
-    public URL getEndpoint() throws MalformedURLException {
-        return new URL(endpoint);
-    }
-
-    @Override
-    public String getSystemName() {
-        return "MSO";
-    }
-
-    @Override
-    public AAIVersion getDefaultVersion() {
-        for (final AAIVersion version : AAIVersion.values()) {
-            if (version.toString().equalsIgnoreCase(this.aaiVersion)) {
-                return version;
-            }
-        }
-        return AAIVersion.LATEST;
-    }
-
-    @Override
-    public String getAuth() {
-        return encryptedBasicAuth;
-    }
-
-    @Override
-    public String getKey() {
-        return encrytptionKey;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProvider.java
deleted file mode 100644
index f527b6cd97..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-
-/**
- * Provides methods for invoking REST calls to AAI.
- */
-public interface AaiServiceProvider {
-
-    /**
-     * Invoke a get request for a generic VNF.
-     *
-     * @param vnfId the VNF id
-     * @return the generic VNF
-     */
-    GenericVnf invokeGetGenericVnf(final String vnfId);
-
-    /**
-     * Invoke a query for a generic VNF with the given selfLink
-     *
-     * @param selfLink the selfLink
-     * @return the matching generic vnfs
-     */
-    GenericVnfs invokeQueryGenericVnf(final String selfLink);
-
-    /**
-     * Invoke a GET request for the VNFMs.
-     *
-     * @return the VNFMs
-     */
-    EsrVnfmList invokeGetVnfms();
-
-    /**
-     * Invoke a GET request for the esr system info list for a VNFM.
-     *
-     * @return the esr system info list for the VNFM
-     */
-    EsrSystemInfoList invokeGetVnfmEsrSystemInfoList(final String vnfmId);
-
-    /**
-     * Invoke a GET request for the a VNFM.
-     *
-     * @param vnfmId the ID of the VNFM
-     * @return the VNFM
-     */
-    EsrVnfm invokeGetVnfm(final String vnfmId);
-
-    /**
-     * Invoke a PATCH request for a generic vnf.
-     *
-     * @param vnf the generic vnf
-     * @return
-     */
-    void invokePatchGenericVnf(GenericVnf vnf);
-
-    /**
-     * Invoke a PUT request for a relationship from a generic vnf to a VNFM.
-     *
-     * @param vnf the generic vnf
-     * @param vnfmId the ID of the VNFM
-     * @return
-     */
-    void invokePutGenericVnfToVnfmRelationship(GenericVnf vnf, final String vnfmId);
-
-
-    /**
-     * Invoke a PUT request for a vserver.
-     *
-     * @param cloudOwner the cloud owner
-     * @param cloudRegion the cloud region
-     * @param tenantId the ID of the tenant
-     * @param vserver the vserver
-     * @return
-     */
-    void invokePutVserver(final String cloudOwner, final String cloudRegion, final String tenantId,
-            final Vserver vserver);
-
-    /**
-     * Invoke a PUT request for a relationship from a vserver to a generic vnf.
-     *
-     * @param cloudOwner the cloud owner
-     * @param cloudRegion the cloud region the vserver is deployed on
-     * @param tenantId the ID of the tenant the vserver is deployed on
-     * @param vserver the vserver
-     * @param vnfId the ID of the generic vnf
-     * @return
-     */
-    void invokePutVserverToVnfRelationship(final String cloudOwner, final String cloudRegion, final String tenantId,
-            final Vserver vserver, final String vnfId);
-
-    /**
-     * Invoke a DELETE request for a vserver.
-     *
-     * @param cloudOwner the cloud owner
-     * @param cloudRegion the cloud region
-     * @param tenantId the ID of the tenant
-     * @param vserverId the ID of the vserver
-     * @return
-     */
-    void invokeDeleteVserver(final String cloudOwner, final String cloudRegion, final String tenantId,
-            final String vserverId);
-
-    /**
-     * Invoke a GET request for the a tenant.
-     *
-     * @param cloudOwner the cloud owner
-     * @param cloudRegion the cloud region
-     * @param tenantId the ID of the tenant
-     * @return the tenant
-     */
-    Tenant invokeGetTenant(final String cloudOwner, final String cloudRegion, final String tenantId);
-
-    /**
-     * Invoke a GET request for the esr system info list for a cloud region.
-     *
-     * @param cloudOwner the cloud owner
-     * @param cloudRegion the cloud region
-     * @return the esr system info list for the VNFM
-     */
-    EsrSystemInfoList invokeGetCloudRegionEsrSystemInfoList(final String cloudOwner, final String cloudRegion);
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProviderImpl.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProviderImpl.java
deleted file mode 100644
index 8f95d8ab85..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/AaiServiceProviderImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
-import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder;
-import org.onap.aaiclient.client.graphinventory.entities.uri.Depth;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AaiServiceProviderImpl implements AaiServiceProvider {
-
-    private static final Logger logger = LoggerFactory.getLogger(AaiServiceProviderImpl.class);
-    private final AaiClientProvider aaiClientProvider;
-
-    @Autowired
-    public AaiServiceProviderImpl(final AaiClientProvider aaiClientProvider) {
-        this.aaiClientProvider = aaiClientProvider;
-    }
-
-    @Override
-    public GenericVnf invokeGetGenericVnf(final String vnfId) {
-        return aaiClientProvider.getAaiClient()
-                .get(GenericVnf.class,
-                        AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId)))
-                .orElseGet(() -> {
-                    logger.debug("No vnf found in AAI with ID: {}", vnfId);
-                    return null;
-                });
-    }
-
-    @Override
-    public GenericVnfs invokeQueryGenericVnf(final String selfLink) {
-        return aaiClientProvider.getAaiClient().get(GenericVnfs.class, AAIUriFactory
-                .createResourceUri(AAIFluentTypeBuilder.network().genericVnfs()).queryParam("selflink", selfLink))
-                .orElseGet(() -> {
-                    logger.debug("No vnf found in AAI with selflink: {}", selfLink);
-                    return null;
-                });
-    }
-
-    @Override
-    public EsrVnfmList invokeGetVnfms() {
-        return aaiClientProvider.getAaiClient()
-                .get(EsrVnfmList.class,
-                        AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfmList()))
-                .orElseGet(() -> {
-                    logger.debug("No VNFMs in AAI");
-                    return null;
-                });
-    }
-
-    @Override
-    public EsrVnfm invokeGetVnfm(final String vnfmId) {
-        return aaiClientProvider.getAaiClient()
-                .get(EsrVnfm.class, AAIUriFactory
-                        .createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfm(vnfmId)).depth(Depth.ONE))
-                .orElseGet(() -> {
-                    logger.debug("VNFM not found in AAI");
-                    return null;
-                });
-    }
-
-    @Override
-    public EsrSystemInfoList invokeGetVnfmEsrSystemInfoList(final String vnfmId) {
-        return aaiClientProvider.getAaiClient()
-                .get(EsrSystemInfoList.class,
-                        AAIUriFactory.createResourceUri(
-                                AAIFluentTypeBuilder.externalSystem().esrVnfm(vnfmId).esrSystemInfoList()))
-                .orElseGet(() -> {
-                    logger.debug("VNFM ESR system info list not found in AAI");
-                    return null;
-                });
-    }
-
-    @Override
-    public void invokePatchGenericVnf(final GenericVnf vnf) {
-        aaiClientProvider.getAaiClient().update(
-                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnf.getVnfId())), vnf);
-    }
-
-    @Override
-    public void invokePutGenericVnfToVnfmRelationship(final GenericVnf vnf, final String vnfmId) {
-        aaiClientProvider.getAaiClient().connect(
-                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.externalSystem().esrVnfm(vnfmId)),
-                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnf.getVnfId())));
-    }
-
-    @Override
-    public void invokePutVserver(final String cloudOwner, final String cloudRegion, final String tenant,
-            final Vserver vserver) {
-        aaiClientProvider
-                .getAaiClient().create(
-                        AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure()
-                                .cloudRegion(cloudOwner, cloudRegion).tenant(tenant).vserver(vserver.getVserverId())),
-                        vserver);
-    }
-
-    @Override
-    public void invokePutVserverToVnfRelationship(final String cloudOwner, final String cloudRegion,
-            final String tenant, final Vserver vserver, final String vnfId) {
-        aaiClientProvider.getAaiClient().connect(
-                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure()
-                        .cloudRegion(cloudOwner, cloudRegion).tenant(tenant).vserver(vserver.getVserverId())),
-                AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.network().genericVnf(vnfId)));
-    }
-
-    @Override
-    public void invokeDeleteVserver(final String cloudOwner, final String cloudRegion, final String tenant,
-            final String vserverId) {
-        aaiClientProvider.getAaiClient().delete(AAIUriFactory.createResourceUri(AAIFluentTypeBuilder
-                .cloudInfrastructure().cloudRegion(cloudOwner, cloudRegion).tenant(tenant).vserver(vserverId)));
-    }
-
-    @Override
-    public Tenant invokeGetTenant(final String cloudOwner, final String cloudRegion, final String tenantId) {
-        return aaiClientProvider.getAaiClient().get(Tenant.class, AAIUriFactory.createResourceUri(
-                AAIFluentTypeBuilder.cloudInfrastructure().cloudRegion(cloudOwner, cloudRegion).tenant(tenantId)))
-                .orElseGet(() -> {
-                    logger.debug("Tenant not found in AAI");
-                    return null;
-                });
-    }
-
-    @Override
-    public EsrSystemInfoList invokeGetCloudRegionEsrSystemInfoList(final String cloudOwner, final String cloudRegion) {
-        return aaiClientProvider
-                .getAaiClient().get(EsrSystemInfoList.class, AAIUriFactory.createResourceUri(AAIFluentTypeBuilder
-                        .cloudInfrastructure().cloudRegion(cloudOwner, cloudRegion).esrSystemInfoList()))
-                .orElseGet(() -> {
-                    logger.debug("Cloud esr system info list not found in AAI");
-                    return null;
-                });
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/OamIpAddressSource.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/OamIpAddressSource.java
deleted file mode 100644
index b81925241c..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/aai/OamIpAddressSource.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai;
-
-/**
- * Represents the source of the value to use as the AAI OAM IP address of a VNF
- */
-public class OamIpAddressSource {
-
-    private final OamIpAddressType type;
-    private final String value;
-
-    public OamIpAddressSource(final OamIpAddressType type, final String value) {
-        this.type = type;
-        this.value = value;
-    }
-
-    public OamIpAddressType getType() {
-        return type;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public enum OamIpAddressType {
-        /**
-         * The value passed in {@link OamIpAddress#OamIpAddress(OamIpAddressType, String)} is to be used directly as the
-         * OAM IP address
-         */
-        LITERAL,
-        /**
-         * The OAM IP address is to be retrieved from the vnfConfigurableProperties returned from the VNFM using the
-         * value passed in {@link OamIpAddress#OamIpAddress(OamIpAddressType, String)} as the name of a property
-         */
-        CONFIGURABLE_PROPERTY
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/AccessInfo.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/AccessInfo.java
deleted file mode 100644
index 139df248d4..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/AccessInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model;
-
-import java.util.Objects;
-
-public class AccessInfo {
-
-    protected String projectId;
-    protected String projectName;
-    protected String domainName;
-    protected VimCredentials credentials;
-
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(final String value) {
-        projectId = value;
-    }
-
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(final String value) {
-        projectName = value;
-    }
-
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public void setDomainName(final String value) {
-        domainName = value;
-    }
-
-    public VimCredentials getCredentials() {
-        return credentials;
-    }
-
-    public void setCredentials(final VimCredentials value) {
-        credentials = value;
-    }
-
-    @Override
-    public boolean equals(final java.lang.Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final AccessInfo accessInfo = (AccessInfo) o;
-        return Objects.equals(this.projectId, accessInfo.projectId)
-                && Objects.equals(this.projectName, accessInfo.projectName)
-                && Objects.equals(this.domainName, accessInfo.domainName)
-                && Objects.equals(this.credentials, accessInfo.credentials);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(projectId, projectName, domainName, credentials);
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("class AccessInfo {\n");
-
-        sb.append("    projectId: ").append(toIndentedString(projectId)).append("\n");
-        sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
-        sb.append("    domainName: ").append(toIndentedString(domainName)).append("\n");
-        sb.append("    credentials: ").append(toIndentedString(credentials)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces (except the first line).
-     */
-    private String toIndentedString(final java.lang.Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/InterfaceInfo.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/InterfaceInfo.java
deleted file mode 100644
index 9d4355a0c4..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/InterfaceInfo.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model;
-
-import java.util.Objects;
-
-public class InterfaceInfo {
-
-    protected String identityEndPoint;
-
-    public String getIdentityEndPoint() {
-        return identityEndPoint;
-    }
-
-    public void setIdentityEndPoint(final String value) {
-        identityEndPoint = value;
-    }
-
-    @Override
-    public boolean equals(final java.lang.Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final InterfaceInfo interfaceInfo = (InterfaceInfo) o;
-        return Objects.equals(this.identityEndPoint, interfaceInfo.identityEndPoint);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(identityEndPoint);
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("class InterfaceInfo {\n");
-
-        sb.append("    identityEndPoint: ").append(toIndentedString(identityEndPoint)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces (except the first line).
-     */
-    private String toIndentedString(final java.lang.Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/VimCredentials.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/VimCredentials.java
deleted file mode 100644
index fd1a9078bb..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vim/model/VimCredentials.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model;
-
-import java.util.Objects;
-
-public class VimCredentials {
-
-    protected String username;
-
-    protected String password;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(final String value) {
-        username = value;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(final String password) {
-        this.password = password;
-    }
-
-    @Override
-    public boolean equals(final java.lang.Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        final VimCredentials vimCredentials = (VimCredentials) o;
-        return Objects.equals(this.username, vimCredentials.username)
-                && Objects.equals(this.password, vimCredentials.password);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(username, password);
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("class AccessInfo {\n");
-
-        sb.append("    username: ").append(toIndentedString(username)).append("\n");
-        sb.append("    password: ").append(toIndentedString(password)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces (except the first line).
-     */
-    private String toIndentedString(final java.lang.Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmHelper.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmHelper.java
deleted file mode 100644
index 9155261bd2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmHelper.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model.AccessInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model.InterfaceInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model.VimCredentials;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InstantiateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.LccnSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsAuthenticationParamsBasic;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsAuthenticationParamsOauth2ClientCredentials;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsFilter;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsFilter.NotificationTypesEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.SubscriptionsFilterVnfInstanceSubscriptionFilter;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.VnfInstancesvnfInstanceIdinstantiateExtVirtualLinks;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201VimConnections;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.ExternalVirtualLink;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-/**
- * Provides helper methods for interactions with VNFM.
- */
-@Service
-public class VnfmHelper {
-
-    private static final Logger logger = LoggerFactory.getLogger(VnfmHelper.class);
-    private static final String SEPARATOR = "_";
-    private final AaiServiceProvider aaiServiceProvider;
-    private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
-
-    @Autowired
-    public VnfmHelper(final AaiServiceProvider aaiServiceProvider,
-            final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        this.aaiServiceProvider = aaiServiceProvider;
-        this.vnfmAdapterUrlProvider = vnfmAdapterUrlProvider;
-    }
-
-    /**
-     * Create an {@link InstantiateVnfRequest} to send in an instantiation request to a VNFM.
-     *
-     * @param tenant the tenant the request is to be fulfilled on
-     * @param createVnfRequest the request received by the VNFM adapter
-     */
-    public InstantiateVnfRequest createInstantiateRequest(final Tenant tenant, final CreateVnfRequest createVnfRequest,
-            final String flavourId) {
-        final InstantiateVnfRequest instantiateVnfRequest = new InstantiateVnfRequest();
-        instantiateVnfRequest.setFlavourId(flavourId);
-        instantiateVnfRequest.setVimConnectionInfo(getVimConnectionInfos(tenant));
-        instantiateVnfRequest
-                .setAdditionalParams(getAdditionalParametersAsJsonObject(createVnfRequest.getAdditionalParams()));
-        instantiateVnfRequest.setExtVirtualLinks(getExternalVirtualLinks(createVnfRequest.getExternalVirtualLinks()));
-        createVnfRequest.getExternalVirtualLinks();
-        return instantiateVnfRequest;
-    }
-
-    private List<VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo> getVimConnectionInfos(final Tenant tenant) {
-        final List<VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo> connectionInfos = new ArrayList<>();
-        connectionInfos.add(getVimConnectionInfo(tenant));
-        return connectionInfos;
-    }
-
-    private VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo getVimConnectionInfo(final Tenant tenant) {
-        final EsrSystemInfo esrSystemInfo =
-                aaiServiceProvider.invokeGetCloudRegionEsrSystemInfoList(tenant.getCloudOwner(), tenant.getRegionName())
-                        .getEsrSystemInfo().iterator().next();
-
-        final VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo vnfInstancesVimConnectionInfo =
-                new VnfInstancesvnfInstanceIdinstantiateVimConnectionInfo();
-        final String vimId = createVimId(tenant.getCloudOwner(), tenant.getRegionName());
-        vnfInstancesVimConnectionInfo.setId(vimId);
-        vnfInstancesVimConnectionInfo.setVimId(vimId);
-        vnfInstancesVimConnectionInfo.setVimType(esrSystemInfo.getType());
-        vnfInstancesVimConnectionInfo.setInterfaceInfo(getInterfaceInfo(esrSystemInfo.getServiceUrl()));
-        vnfInstancesVimConnectionInfo.setAccessInfo(getAccessInfo(esrSystemInfo, tenant.getTenantId()));
-        return vnfInstancesVimConnectionInfo;
-    }
-
-    private InterfaceInfo getInterfaceInfo(final String url) {
-        final InterfaceInfo interfaceInfo = new InterfaceInfo();
-        interfaceInfo.setIdentityEndPoint(url);
-        return interfaceInfo;
-    }
-
-    private AccessInfo getAccessInfo(final EsrSystemInfo esrSystemInfo, final String tenantId) {
-        final AccessInfo accessInfo = new AccessInfo();
-        accessInfo.setProjectId(tenantId);
-        accessInfo.setDomainName(esrSystemInfo.getCloudDomain());
-
-        final VimCredentials vimCredentials = new VimCredentials();
-        vimCredentials.setUsername(esrSystemInfo.getUserName());
-        vimCredentials.setPassword(esrSystemInfo.getPassword());
-        accessInfo.setCredentials(vimCredentials);
-        return accessInfo;
-    }
-
-    private String createVimId(final String cloudOwner, final String cloudRegion) {
-        return cloudOwner + SEPARATOR + cloudRegion;
-    }
-
-    private JsonObject getAdditionalParametersAsJsonObject(final Map<String, String> additionalParameters) {
-        final JsonObject additionalParametersJsonObject = new JsonObject();
-        if (additionalParameters != null) {
-            for (final Map.Entry<String, JsonElement> item : new Gson().toJsonTree(additionalParameters)
-                    .getAsJsonObject().entrySet()) {
-                additionalParametersJsonObject.add(item.getKey(), item.getValue());
-            }
-        } else {
-            logger.warn("No additional parameters were specified for the operation");
-        }
-        return additionalParametersJsonObject;
-    }
-
-    private List<VnfInstancesvnfInstanceIdinstantiateExtVirtualLinks> getExternalVirtualLinks(
-            final List<ExternalVirtualLink> extVirtualLinks) {
-        if (extVirtualLinks != null) {
-            final String extVirtualLinksJsonObject =
-                    new Gson().toJson(extVirtualLinks, new TypeToken<List<ExternalVirtualLink>>() {}.getType());
-            return new Gson().fromJson(extVirtualLinksJsonObject,
-                    new TypeToken<List<VnfInstancesvnfInstanceIdinstantiateExtVirtualLinks>>() {}.getType());
-        }
-        return null;
-    }
-
-    /**
-     * Create a {@link LccnSubscriptionRequest} to send in an notification subscription request to a VNFM.
-     *
-     * @param the ID of the VNF notifications are required for
-     * @return the request
-     * @throws GeneralSecurityException
-     */
-    public LccnSubscriptionRequest createNotificationSubscriptionRequest(final String vnfId)
-            throws GeneralSecurityException {
-        final LccnSubscriptionRequest lccnSubscriptionRequest = new LccnSubscriptionRequest();
-        lccnSubscriptionRequest.setAuthentication(getSubscriptionsAuthentication());
-        lccnSubscriptionRequest.setCallbackUri(vnfmAdapterUrlProvider.getVnfLcmOperationOccurrenceNotificationUrl());
-        final SubscriptionsFilter filter = new SubscriptionsFilter();
-        filter.addNotificationTypesItem(NotificationTypesEnum.VNFLCMOPERATIONOCCURRENCENOTIFICATION);
-        final SubscriptionsFilterVnfInstanceSubscriptionFilter vnfInstanceSubscriptionFilter =
-                new SubscriptionsFilterVnfInstanceSubscriptionFilter();
-        vnfInstanceSubscriptionFilter.addVnfInstanceIdsItem(vnfId);
-        filter.setVnfInstanceSubscriptionFilter(vnfInstanceSubscriptionFilter);
-        lccnSubscriptionRequest.setFilter(filter);
-        return lccnSubscriptionRequest;
-    }
-
-    private SubscriptionsAuthentication getSubscriptionsAuthentication() throws GeneralSecurityException {
-        final SubscriptionsAuthentication authentication = new SubscriptionsAuthentication();
-
-        final ImmutablePair<String, String> decrypedAuth = vnfmAdapterUrlProvider.getDecryptAuth();
-
-        final SubscriptionsAuthenticationParamsOauth2ClientCredentials oauthParams =
-                new SubscriptionsAuthenticationParamsOauth2ClientCredentials();
-        oauthParams.setTokenEndpoint(vnfmAdapterUrlProvider.getOauthTokenUrl());
-        oauthParams.clientId(decrypedAuth.getLeft());
-        oauthParams.setClientPassword(decrypedAuth.getRight());
-        authentication.addAuthTypeItem(AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS);
-        authentication.paramsOauth2ClientCredentials(oauthParams);
-
-        final SubscriptionsAuthenticationParamsBasic basicAuthParams = new SubscriptionsAuthenticationParamsBasic();
-        basicAuthParams.setUserName(decrypedAuth.getLeft());
-        basicAuthParams.setPassword(decrypedAuth.getRight());
-        authentication.addAuthTypeItem(AuthTypeEnum.BASIC);
-        authentication.paramsBasic(basicAuthParams);
-
-        authentication.addAuthTypeItem(AuthTypeEnum.TLS_CERT);
-        return authentication;
-    }
-
-    /**
-     * Get the VIM connections for a tenant
-     *
-     * @param tenant the tenant
-     * @return the VIM connections
-     */
-    public InlineResponse201VimConnections getVimConnections(final Tenant tenant) {
-        final EsrSystemInfo esrSystemInfo =
-                aaiServiceProvider.invokeGetCloudRegionEsrSystemInfoList(tenant.getCloudOwner(), tenant.getRegionName())
-                        .getEsrSystemInfo().iterator().next();
-
-        final InlineResponse201VimConnections vimConnection = new InlineResponse201VimConnections();
-        vimConnection.setId(createVimId(tenant.getCloudOwner(), tenant.getRegionName()));
-        vimConnection.setVimId(vimConnection.getId());
-        vimConnection.setVimType(esrSystemInfo.getType());
-        vimConnection.setInterfaceInfo(getInterfaceInfo(esrSystemInfo.getServiceUrl()));
-        vimConnection.setAccessInfo(getAccessInfo(esrSystemInfo, tenant.getTenantId()));
-        return vimConnection;
-    }
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmRestTemplateConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmRestTemplateConfiguration.java
deleted file mode 100644
index 2c7ddd1d49..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmRestTemplateConfiguration.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import org.onap.logging.filter.spring.SpringClientPayloadFilter;
-import org.onap.so.configuration.rest.HttpComponentsClientConfiguration;
-import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Configuration
-public class VnfmRestTemplateConfiguration {
-
-    public static final String SOL003_LCM_REST_TEMPLATE = "Sol003LcmRestTemplate";
-
-    @Autowired
-    private HttpComponentsClientConfiguration httpComponentsClientConfiguration;
-
-    @Bean
-    @Qualifier(SOL003_LCM_REST_TEMPLATE)
-    public RestTemplate sol003LcmRestTemplate() {
-        final HttpComponentsClientHttpRequestFactory clientHttpRequestFactory =
-                httpComponentsClientConfiguration.httpComponentsClientHttpRequestFactory();
-        final RestTemplate restTemplate =
-                new RestTemplate(new BufferingClientHttpRequestFactory(clientHttpRequestFactory));
-        restTemplate.getInterceptors().add(new SOSpringClientFilter());
-        restTemplate.getInterceptors().add((new SpringClientPayloadFilter()));
-        return restTemplate;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProvider.java
deleted file mode 100644
index a6c6740235..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InstantiateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.LccnSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.TerminateVnfRequest;
-import com.google.common.base.Optional;
-
-/**
- * Provides methods for invoking REST calls to a VNFM.
- */
-public interface VnfmServiceProvider {
-
-    /**
-     * Invoke a get request for a VNF.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param vnfSelfLink the link to the VNF in the VNFM
-     * @return the VNF from the VNFM
-     */
-    Optional<InlineResponse201> getVnf(final EsrVnfm vnfm, final String vnfSelfLink);
-
-    /**
-     * Invoke an instantiate request for a VNF.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param vnfSelfLink the link to he VNF on the VNFM
-     * @param instantiateVnfRequest the instantiate request
-     * @return the operation ID of the instantiation operation
-     */
-    String instantiateVnf(final EsrVnfm vnfm, final String vnfSelfLink,
-            final InstantiateVnfRequest instantiateVnfRequest);
-
-    /**
-     * Invoke a notification subscription request to a VNFM.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param subscriptionRequest
-     * @return the response to the subscription request
-     */
-    InlineResponse2001 subscribeForNotifications(final EsrVnfm vnfm, final LccnSubscriptionRequest subscriptionRequest);
-
-    /**
-     * Invoke a terminate request for a VNF.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param vnfSelfLink the link to he VNF on the VNFM
-     * @param terminateVnfRequest the terminate request
-     * @return the operation ID of the termination operation
-     */
-    String terminateVnf(final EsrVnfm vnfm, final String vnfSelfLink, final TerminateVnfRequest terminateVnfRequest);
-
-    /**
-     * Invoke a delete request for a VNF.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param vnfSelfLink the link to he VNF on the VNFM
-     * @return the operation ID of the instantiation operation
-     */
-    void deleteVnf(final EsrVnfm vnfm, final String vnfSelfLink);
-
-    /**
-     * Invoke a get request for a VNFM operation.
-     *
-     * @param vnfm the VNFM in AAI
-     * @param operationId the id of the operation on the VNFM
-     * @return the operation from the VNFM
-     */
-    Optional<InlineResponse200> getOperation(final EsrVnfm vnfm, final String operationId);
-
-    /**
-     * Invoke a create request to a VNFM
-     *
-     * @param vnfm the VNFM in AAI
-     * @param createVnfRequest the parameters for creating a VNF
-     * @return the newly created VNF
-     */
-    Optional<InlineResponse201> createVnf(final EsrVnfm vnfm, final CreateVnfRequest createVnfRequest);
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderConfiguration.java
deleted file mode 100644
index 1ed3ec9ff2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderConfiguration.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.net.ssl.SSLContext;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.HttpClient;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.so.adapters.etsi.sol003.adapter.common.configuration.AbstractServiceProviderConfiguration;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.JSON;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.onap.so.rest.service.HttpRestServiceProviderImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.security.oauth2.client.OAuth2RestTemplate;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * Configures the HttpRestServiceProvider for REST call to a VNFM.
- */
-@Configuration
-public class VnfmServiceProviderConfiguration extends AbstractServiceProviderConfiguration {
-
-    private static final Logger logger = LoggerFactory.getLogger(VnfmServiceProviderConfiguration.class);
-    private final Map<String, HttpRestServiceProvider> mapOfVnfmIdToHttpRestServiceProvider = new ConcurrentHashMap<>();
-
-    @Value("${http.client.ssl.trust-store:#{null}}")
-    private Resource trustStore;
-    @Value("${http.client.ssl.trust-store-password:#{null}}")
-    private String trustStorePassword;
-
-    @Value("${server.ssl.key-store:#{null}}")
-    private Resource keyStoreResource;
-    @Value("${server.ssl.key--store-password:#{null}}")
-    private String keyStorePassword;
-
-    /**
-     * This property is only intended to be temporary until the AAI schema is updated to support setting the endpoint
-     */
-    @Value("${vnfmadapter.temp.vnfm.oauth.endpoint:#{null}}")
-    private String oauthEndpoint;
-
-    @Qualifier(VnfmRestTemplateConfiguration.SOL003_LCM_REST_TEMPLATE)
-    @Autowired
-    private RestTemplate defaultRestTemplate;
-
-    public HttpRestServiceProvider getHttpRestServiceProvider(final EsrVnfm vnfm) {
-        if (!mapOfVnfmIdToHttpRestServiceProvider.containsKey(vnfm.getVnfmId())) {
-            mapOfVnfmIdToHttpRestServiceProvider.put(vnfm.getVnfmId(), createHttpRestServiceProvider(vnfm));
-        }
-        return mapOfVnfmIdToHttpRestServiceProvider.get(vnfm.getVnfmId());
-    }
-
-    private HttpRestServiceProvider createHttpRestServiceProvider(final EsrVnfm vnfm) {
-        final RestTemplate restTemplate = createRestTemplate(vnfm);
-        setGsonMessageConverter(restTemplate);
-        if (trustStore != null) {
-            setTrustStore(restTemplate);
-        }
-        return new HttpRestServiceProviderImpl(restTemplate, new BasicHttpHeadersProvider().getHttpHeaders());
-    }
-
-    private RestTemplate createRestTemplate(final EsrVnfm vnfm) {
-        if (vnfm != null) {
-            for (final EsrSystemInfo esrSystemInfo : vnfm.getEsrSystemInfoList().getEsrSystemInfo()) {
-                if (!StringUtils.isEmpty(esrSystemInfo.getUserName())
-                        && !StringUtils.isEmpty(esrSystemInfo.getPassword())) {
-                    return createOAuth2RestTemplate(esrSystemInfo);
-                }
-            }
-        }
-        return defaultRestTemplate;
-    }
-
-    private OAuth2RestTemplate createOAuth2RestTemplate(final EsrSystemInfo esrSystemInfo) {
-        logger.debug("Getting OAuth2RestTemplate ...");
-        final ClientCredentialsResourceDetails resourceDetails = new ClientCredentialsResourceDetails();
-        resourceDetails.setId(UUID.randomUUID().toString());
-        resourceDetails.setClientId(esrSystemInfo.getUserName());
-        resourceDetails.setClientSecret(esrSystemInfo.getPassword());
-        resourceDetails.setAccessTokenUri(
-                oauthEndpoint == null ? esrSystemInfo.getServiceUrl().replace("vnflcm/v1", "oauth/token")
-                        : oauthEndpoint);
-        resourceDetails.setGrantType("client_credentials");
-        return new OAuth2RestTemplate(resourceDetails);
-    }
-
-    private void setTrustStore(final RestTemplate restTemplate) {
-        SSLContext sslContext;
-        try {
-            if (keyStoreResource != null) {
-                final KeyStore keystore = KeyStore.getInstance("pkcs12");
-                keystore.load(keyStoreResource.getInputStream(), keyStorePassword.toCharArray());
-                sslContext =
-                        new SSLContextBuilder().loadTrustMaterial(trustStore.getURL(), trustStorePassword.toCharArray())
-                                .loadKeyMaterial(keystore, keyStorePassword.toCharArray()).build();
-            } else {
-                sslContext = new SSLContextBuilder()
-                        .loadTrustMaterial(trustStore.getURL(), trustStorePassword.toCharArray()).build();
-            }
-            logger.info("Setting truststore: {}", trustStore.getURL());
-            final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext);
-            final HttpClient httpClient = HttpClients.custom().setSSLSocketFactory(socketFactory).build();
-            final HttpComponentsClientHttpRequestFactory factory =
-                    new HttpComponentsClientHttpRequestFactory(httpClient);
-            restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(factory));
-        } catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
-                | IOException | UnrecoverableKeyException exception) {
-            logger.error("Error reading truststore, TLS connection to VNFM will fail.", exception);
-        }
-    }
-
-    @Override
-    protected Gson getGson() {
-        return new JSON().getGson();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderImpl.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderImpl.java
deleted file mode 100644
index 6e0978a106..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmServiceProviderImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201.InstantiationStateEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InstantiateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.LccnSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.TerminateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement.JobManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmRequestFailureException;
-import org.onap.so.rest.exceptions.RestProcessingException;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import com.google.common.base.Optional;
-import java.util.List;
-
-@Service
-public class VnfmServiceProviderImpl implements VnfmServiceProvider {
-    private static final Logger logger = LoggerFactory.getLogger(VnfmServiceProviderImpl.class);
-    private static final String MESSAGE_RESULTED_IN_EXCEPTION = " resulted in exception";
-    private static final String MESSAGE_REQUEST = ", request: ";
-    private static final String MESSAGE_TERMINATE_REQUEST_TO = "Terminate request to ";
-
-    private final VnfmServiceProviderConfiguration vnfmServiceProviderConfiguration;
-    private final VnfmUrlProvider urlProvider;
-
-    @Autowired
-    public VnfmServiceProviderImpl(final VnfmUrlProvider urlProvider,
-            final VnfmServiceProviderConfiguration vnfmServiceProviderConfiguration) {
-        this.vnfmServiceProviderConfiguration = vnfmServiceProviderConfiguration;
-        this.urlProvider = urlProvider;
-    }
-
-    @Override
-    public Optional<InlineResponse201> getVnf(final EsrVnfm vnfm, final String vnfSelfLink) {
-        return getHttpServiceProvider(vnfm).get(vnfSelfLink, InlineResponse201.class);
-    }
-
-    @Override
-    public String instantiateVnf(final EsrVnfm vnfm, final String vnfSelfLink,
-            final InstantiateVnfRequest instantiateVnfRequest) {
-        logger.debug("Sending instantiate request {} to : {}", instantiateVnfRequest, vnfSelfLink);
-        ResponseEntity<Void> response = null;
-        try {
-            response = getHttpServiceProvider(vnfm).postHttpRequest(instantiateVnfRequest, vnfSelfLink + "/instantiate",
-                    Void.class);
-        } catch (final Exception exception) {
-            final String errorMessage =
-                    "Instantiate request to " + vnfSelfLink + MESSAGE_RESULTED_IN_EXCEPTION + instantiateVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage, exception);
-        }
-        if (response.getStatusCode() != HttpStatus.ACCEPTED) {
-            final String errorMessage = "Instantiate request to " + vnfSelfLink + " returned status code: "
-                    + response.getStatusCode() + MESSAGE_REQUEST + instantiateVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage);
-        }
-        String locationHeader = getLocationHeader(response);
-        return locationHeader.substring(locationHeader.lastIndexOf("/") + 1);
-    }
-
-    @Override
-    public InlineResponse2001 subscribeForNotifications(final EsrVnfm vnfm,
-            final LccnSubscriptionRequest subscriptionRequest) {
-        logger.info("Subscribing for notifications {}", subscriptionRequest);
-        final String url = urlProvider.getSubscriptionsUrl(vnfm.getVnfmId());
-        ResponseEntity<InlineResponse2001> response = null;
-        try {
-            response = getHttpServiceProvider(vnfm).postHttpRequest(subscriptionRequest, url, InlineResponse2001.class);
-            logger.info("Subscribing for notifications response {}", response);
-        } catch (final Exception exception) {
-            final String errorMessage =
-                    "Subscription to VNFM " + vnfm.getVnfmId() + MESSAGE_RESULTED_IN_EXCEPTION + subscriptionRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage, exception);
-        }
-        if (response.getStatusCode() != HttpStatus.CREATED) {
-            final String errorMessage = "Subscription to VNFM " + vnfm.getVnfmId() + " returned status code: "
-                    + response.getStatusCode() + MESSAGE_REQUEST + subscriptionRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage);
-        }
-        return response.getBody();
-    }
-
-    @Override
-    public String terminateVnf(final EsrVnfm vnfm, final String vnfSelfLink,
-            final TerminateVnfRequest terminateVnfRequest) {
-        logger.debug("Sending terminate request {} to : {}", terminateVnfRequest, vnfSelfLink);
-        ResponseEntity<Void> response = null;
-        try {
-            response = getHttpServiceProvider(vnfm).postHttpRequest(terminateVnfRequest, vnfSelfLink + "/terminate",
-                    Void.class);
-        } catch (final RestProcessingException restProcessingException) {
-            if (restProcessingException.getStatusCode() == HttpStatus.CONFLICT.value()) {
-                final InlineResponse201 vnf = getVnf(vnfm, vnfSelfLink).get();
-                if (vnf.getInstantiationState().equals(InstantiationStateEnum.NOT_INSTANTIATED)) {
-                    return JobManager.ALREADY_COMPLETED_OPERATION_ID;
-                } else {
-                    final String errorMessage = MESSAGE_TERMINATE_REQUEST_TO + vnfSelfLink
-                            + MESSAGE_RESULTED_IN_EXCEPTION + terminateVnfRequest;
-                    logger.error(errorMessage, restProcessingException);
-                    throw new VnfmRequestFailureException(errorMessage, restProcessingException);
-                }
-            }
-        } catch (final Exception exception) {
-            final String errorMessage =
-                    MESSAGE_TERMINATE_REQUEST_TO + vnfSelfLink + MESSAGE_RESULTED_IN_EXCEPTION + terminateVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage, exception);
-        }
-        checkIfResponseIsAcceptable(response, vnfSelfLink, terminateVnfRequest);
-        String locationHeader = getLocationHeader(response);
-        return locationHeader.substring(locationHeader.lastIndexOf("/") + 1);
-    }
-
-    @Override
-    public void deleteVnf(final EsrVnfm vnfm, final String vnfSelfLink) {
-        logger.debug("Sending delete request to : {}", vnfSelfLink);
-        final ResponseEntity<Void> response = getHttpServiceProvider(vnfm).deleteHttpRequest(vnfSelfLink, Void.class);
-        if (response.getStatusCode() != HttpStatus.NO_CONTENT) {
-            throw new VnfmRequestFailureException(
-                    "Delete request to " + vnfSelfLink + " return status code: " + response.getStatusCode());
-        }
-    }
-
-    @Override
-    public Optional<InlineResponse200> getOperation(final EsrVnfm vnfm, final String operationId) {
-        final String url = urlProvider.getOperationUrl(vnfm.getVnfmId(), operationId);
-        return getHttpServiceProvider(vnfm).get(url, InlineResponse200.class);
-    }
-
-    @Override
-    public Optional<InlineResponse201> createVnf(final EsrVnfm vnfm, final CreateVnfRequest createVnfRequest) {
-        final String url = urlProvider.getCreationUrl(vnfm.getVnfmId());
-        logger.debug("Sending create request {} to : {}", createVnfRequest, url);
-        try {
-            return getHttpServiceProvider(vnfm).post(createVnfRequest, url, InlineResponse201.class);
-        } catch (final Exception exception) {
-            final String errorMessage =
-                    "Create request to vnfm:" + vnfm.getVnfmId() + MESSAGE_RESULTED_IN_EXCEPTION + createVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage, exception);
-        }
-    }
-
-    private void checkIfResponseIsAcceptable(final ResponseEntity<Void> response, final String vnfSelfLink,
-            final TerminateVnfRequest terminateVnfRequest) {
-        if (response == null) {
-            final String errorMessage = MESSAGE_TERMINATE_REQUEST_TO + vnfSelfLink + ", response is null, "
-                    + "request: " + terminateVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage);
-        }
-        if (response.getStatusCode() != HttpStatus.ACCEPTED) {
-            final String errorMessage = MESSAGE_TERMINATE_REQUEST_TO + vnfSelfLink + ", returned status code: "
-                    + response.getStatusCode() + MESSAGE_REQUEST + terminateVnfRequest;
-            logger.error(errorMessage);
-            throw new VnfmRequestFailureException(errorMessage);
-        }
-    }
-
-    private HttpRestServiceProvider getHttpServiceProvider(final EsrVnfm vnfm) {
-        return vnfmServiceProviderConfiguration.getHttpRestServiceProvider(vnfm);
-    }
-
-    private String getLocationHeader(ResponseEntity<Void> response) {
-        List<String> headers = response.getHeaders().get("Location");
-        if ((headers == null) || (headers.isEmpty())) {
-            throw new VnfmRequestFailureException("No headers found in response");
-        }
-        return headers.iterator().next();
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmUrlProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmUrlProvider.java
deleted file mode 100644
index a9319c07fe..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/extclients/vnfm/VnfmUrlProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.net.URI;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmNotFoundException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.util.UriComponentsBuilder;
-
-/**
- * Provides URLs for REST calls to a VNFM.
- */
-@Service
-public class VnfmUrlProvider {
-
-    private static Logger logger = getLogger(VnfmUrlProvider.class);
-    private final AaiServiceProvider aaiServiceProvider;
-
-    @Autowired
-    public VnfmUrlProvider(final AaiServiceProvider aaiServiceProvider) {
-        this.aaiServiceProvider = aaiServiceProvider;
-    }
-
-    /**
-     * Get the URL for an operation on a VNFM.
-     *
-     * @param vnfmId The ID of the VNFM
-     * @return the URL of the operation
-     */
-    public String getOperationUrl(final String vnfmId, final String operationId) {
-        final String url = UriComponentsBuilder.fromUri(getBaseUri(vnfmId)).pathSegment("vnf_lcm_op_occs")
-                .pathSegment(operationId).build().toString();
-        logger.debug("getOperationUrl:" + url);
-
-        return url;
-    }
-
-    /**
-     * Get the URL for the subscriptions on a VNFM.
-     *
-     * @param vnfmId The ID of the VNFM
-     * @return the URL of the subscriptions
-     */
-    public String getSubscriptionsUrl(final String vnfmId) {
-        final String url =
-                UriComponentsBuilder.fromUri(getBaseUri(vnfmId)).pathSegment("subscriptions").build().toString();
-        logger.debug("getSubscriptionUrl:" + url);
-
-        return url;
-    }
-
-    public String getCreationUrl(final String vnfmId) {
-        final String url =
-                UriComponentsBuilder.fromUri(getBaseUri(vnfmId)).pathSegment("vnf_instances").build().toString();
-        logger.debug("getCreationUrl:" + url);
-
-        return url;
-    }
-
-    private URI getBaseUri(final String vnfmId) {
-        final EsrSystemInfoList vnfmEsrSystemInfoList = aaiServiceProvider.invokeGetVnfmEsrSystemInfoList(vnfmId);
-
-        if (vnfmEsrSystemInfoList != null) {
-            for (final EsrSystemInfo esrSystemInfo : vnfmEsrSystemInfoList.getEsrSystemInfo()) {
-                return UriComponentsBuilder.fromHttpUrl(esrSystemInfo.getServiceUrl()).build().toUri();
-            }
-        }
-
-        throw new VnfmNotFoundException("VNFM, or Service URL for VNFM, not found for VNFM " + vnfmId);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/JobManager.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/JobManager.java
deleted file mode 100644
index 5ac0179176..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/JobManager.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.Map;
-import java.util.UUID;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.JobNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStateEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStatusRetrievalStatusEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.QueryJobResponse;
-import org.onap.so.rest.exceptions.HttpResouceNotFoundException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import com.google.common.base.Optional;
-import com.google.common.collect.Maps;
-
-/**
- * Manages jobs enabling the status of jobs to be queried. A job is associated with an operation on a VNFM.
- */
-@Component
-public class JobManager {
-    public static final String ALREADY_COMPLETED_OPERATION_ID = "alreadyCompleted";
-    private static final String SEPARATOR = "_";
-    private static Logger logger = getLogger(JobManager.class);
-    private final Map<String, VnfmOperation> mapOfJobIdToVnfmOperation = Maps.newConcurrentMap();
-    private final VnfmServiceProvider vnfmServiceProvider;
-    private final AaiServiceProvider aaiServiceProvider;
-
-    @Autowired
-    JobManager(final VnfmServiceProvider vnfmServiceProvider, final AaiServiceProvider aaiServiceProvider) {
-        this.vnfmServiceProvider = vnfmServiceProvider;
-        this.aaiServiceProvider = aaiServiceProvider;
-    }
-
-    /**
-     * Create a job associated with an operation on a VNFM.
-     *
-     * @param vnfmId the VNFM the operation relates to
-     * @param operationId the ID of the associated VNFM operation
-     * @param waitForNotificationForSuccess if set to <code>true</code> the {@link QueryJobResponse#getOperationState()}
-     *        shall not return {@link org.onap.vnfmadapter.v1.model.OperationStateEnum#COMPLETED} unless a required
-     *        notification has been processed
-     * @return the ID of the job. Can be used to query the job using {@link #getVnfmOperation(String)}
-     */
-    public String createJob(final String vnfmId, final String operationId,
-            final boolean waitForNotificationForSuccess) {
-        final String jobId = vnfmId + SEPARATOR + UUID.randomUUID().toString();
-        final VnfmOperation vnfmOperation = new VnfmOperation(vnfmId, operationId, waitForNotificationForSuccess);
-        mapOfJobIdToVnfmOperation.put(jobId, vnfmOperation);
-        return jobId;
-    }
-
-    /**
-     * Get the operation, associated with the given job ID, from the VNFM.
-     *
-     * @param jobId the job ID
-     * @return the associated operation from the VNFM, or <code>null</code> of no operation is associated with the given
-     *         job ID
-     */
-    public QueryJobResponse getVnfmOperation(final String jobId) {
-        final VnfmOperation vnfmOperation = mapOfJobIdToVnfmOperation.get(jobId);
-        final QueryJobResponse response = new QueryJobResponse();
-
-        if (vnfmOperation == null) {
-            throw new JobNotFoundException("No job found with ID: " + jobId);
-        }
-
-        if (vnfmOperation.getOperationId().equals(ALREADY_COMPLETED_OPERATION_ID)) {
-            response.setOperationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.STATUS_FOUND);
-            return response.operationState(OperationStateEnum.COMPLETED);
-        }
-
-        if (vnfmOperation.isVnfDeleted()) {
-            response.setOperationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.STATUS_FOUND);
-            return response.operationState(getOperationState(vnfmOperation, null));
-        }
-
-        try {
-            final Optional<InlineResponse200> operationOptional = vnfmServiceProvider.getOperation(
-                    aaiServiceProvider.invokeGetVnfm(vnfmOperation.getVnfmId()), vnfmOperation.getOperationId());
-
-            if (!operationOptional.isPresent()) {
-                return response.operationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.OPERATION_NOT_FOUND);
-            }
-            final InlineResponse200 operation = operationOptional.get();
-
-            logger.debug("Job Id: {} operationId: {} operation details: {} ", jobId, operation.getId(), operation);
-
-            if (operation.getOperationState() == null) {
-                return response.operationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.WAITING_FOR_STATUS);
-            }
-
-            response.setOperationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.STATUS_FOUND);
-            response.setId(operation.getId());
-            response.setOperation(OperationEnum.fromValue(operation.getOperation().getValue()));
-            response.setOperationState(getOperationState(vnfmOperation, operation));
-            response.setStartTime(operation.getStartTime());
-            response.setStateEnteredTime(operation.getStateEnteredTime());
-            response.setVnfInstanceId(operation.getVnfInstanceId());
-
-            return response;
-        } catch (final HttpResouceNotFoundException exception) {
-            logger.error("Exception encountered trying to get operation status for operation id "
-                    + vnfmOperation.getOperationId(), exception);
-            return response.operationStatusRetrievalStatus(OperationStatusRetrievalStatusEnum.WAITING_FOR_STATUS);
-        }
-    }
-
-    private OperationStateEnum getOperationState(final VnfmOperation vnfmOperation,
-            final InlineResponse200 operationResponse) {
-        switch (vnfmOperation.getNotificationStatus()) {
-            case NOTIFICATION_PROCESSING_PENDING:
-                return org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStateEnum.PROCESSING;
-            case NOTIFICATION_PROCEESING_SUCCESSFUL:
-                return org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStateEnum.COMPLETED;
-            case NOTIFICATION_PROCESSING_FAILED:
-                return org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStateEnum.FAILED;
-            default:
-                if (operationResponse == null || operationResponse.getOperationState() == null)
-                    return null;
-                return OperationStateEnum.fromValue(operationResponse.getOperationState().getValue());
-        }
-    }
-
-    public void notificationProcessedForOperation(final String operationId,
-            final boolean notificationProcessingWasSuccessful) {
-        logger.debug("Notification processed for operation ID {} success?: {}", operationId,
-                notificationProcessingWasSuccessful);
-        final java.util.Optional<VnfmOperation> relatedOperation = mapOfJobIdToVnfmOperation.values().stream()
-                .filter(operation -> operation.getOperationId().equals(operationId)).findFirst();
-        if (relatedOperation.isPresent()) {
-            relatedOperation.get().setNotificationProcessed(notificationProcessingWasSuccessful);
-        } else {
-            logger.debug("No operation found for operation ID {} ", operationId);
-
-        }
-    }
-
-    public void vnfDeleted(final String operationId) {
-        logger.debug("VNF deleyed for operation ID {}", operationId);
-        final java.util.Optional<VnfmOperation> relatedOperation = mapOfJobIdToVnfmOperation.values().stream()
-                .filter(operation -> operation.getOperationId().equals(operationId)).findFirst();
-        if (relatedOperation.isPresent()) {
-            relatedOperation.get().setVnfDeleted();
-        } else {
-            logger.debug("No operation found for operation ID {} ", operationId);
-        }
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/VnfmOperation.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/VnfmOperation.java
deleted file mode 100644
index 8cb9197d44..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/jobmanagement/VnfmOperation.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement;
-
-/**
- * Represents an operation on a VNFM.
- */
-public class VnfmOperation {
-
-    private final String vnfmId;
-    private final String operationId;
-    private NotificationStatus notificationStatus;
-    private boolean vnfDeleted;
-
-    public VnfmOperation(final String vnfmId, final String operationId, final boolean waitForNotificationForSuccess) {
-        this.vnfmId = vnfmId;
-        this.operationId = operationId;
-        this.notificationStatus = waitForNotificationForSuccess ? NotificationStatus.NOTIFICATION_PROCESSING_PENDING
-                : NotificationStatus.NOTIFICATION_PROCESSING_NOT_REQUIRED;
-    }
-
-    /**
-     * Get the ID of the operation on the VNFM.
-     *
-     * @return the ID of the operation on the VNFM
-     */
-    public String getOperationId() {
-        return operationId;
-    }
-
-    /**
-     * Get the ID of the VNFM the operation is carried out by.
-     *
-     * @return the ID of the VNFM
-     */
-    public String getVnfmId() {
-        return vnfmId;
-    }
-
-    /**
-     * Set the required notification has been processed for the operation.
-     *
-     * @param notificationProcessingWasSuccessful <code>true</code> if the notification processing was successful,
-     *        <code>false<code> otherwise
-     */
-    public void setNotificationProcessed(final boolean notificationProcessingWasSuccessful) {
-        this.notificationStatus =
-                notificationProcessingWasSuccessful ? NotificationStatus.NOTIFICATION_PROCEESING_SUCCESSFUL
-                        : NotificationStatus.NOTIFICATION_PROCESSING_FAILED;
-    }
-
-    /**
-     * Get the notification status for the operation.
-     *
-     * @return the notification status
-     */
-    public NotificationStatus getNotificationStatus() {
-        return notificationStatus;
-    }
-
-    /**
-     * Set the VNF has been deleted from the VNFM.
-     */
-    public void setVnfDeleted() {
-        this.vnfDeleted = true;
-    }
-
-    /**
-     * Check if the VNF has been deleted from the VNFM
-     *
-     * @return <code>true</code> of the VNF has been deleted from the VNFM, <code>false</code> otherwise
-     */
-    public boolean isVnfDeleted() {
-        return vnfDeleted;
-    }
-
-
-    public enum NotificationStatus {
-        /**
-         * No notification handling is required to determine the status of the operation
-         */
-        NOTIFICATION_PROCESSING_NOT_REQUIRED,
-        /**
-         * A notification must be processed before the notification can be considered to be completed
-         */
-        NOTIFICATION_PROCESSING_PENDING,
-        /**
-         * A notification has been successfully handled for the operation
-         */
-        NOTIFICATION_PROCEESING_SUCCESSFUL,
-        /**
-         * An error occurred processing a notification for the operation
-         */
-        NOTIFICATION_PROCESSING_FAILED;
-    }
-
-    @Override
-    public String toString() {
-        return "VnfmOperation [vnfmId=" + vnfmId + ", operationId=" + operationId + ", notificationStatus="
-                + notificationStatus + "]";
-    }
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java
deleted file mode 100644
index 4a8e95ff07..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.lifecycle;
-
-import java.util.Map;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.EtsiPackageProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource.OamIpAddressType;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InstantiateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.LccnSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.TerminateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.TerminateVnfRequest.TerminationTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement.JobManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmRequestFailureException;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.DeleteVnfResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import com.google.common.base.Optional;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-/**
- * Manages lifecycle operations towards the VNFMs.
- */
-@Component
-public class LifecycleManager {
-    private static final Logger logger = LoggerFactory.getLogger(LifecycleManager.class);
-    private final AaiServiceProvider aaiServiceProvider;
-    private final VnfmServiceProvider vnfmServiceProvider;
-    private final AaiHelper aaiHelper;
-    private final VnfmHelper vnfmHelper;
-    private final JobManager jobManager;
-    private final EtsiPackageProvider packageProvider;
-
-    @Autowired
-    LifecycleManager(final AaiServiceProvider aaiServiceProvider, final AaiHelper aaiHelper,
-            final VnfmHelper vnfmHelper, final VnfmServiceProvider vnfmServiceProvider, final JobManager jobManager,
-            final EtsiPackageProvider packageProvider) {
-        this.aaiServiceProvider = aaiServiceProvider;
-        this.vnfmServiceProvider = vnfmServiceProvider;
-        this.aaiHelper = aaiHelper;
-        this.vnfmHelper = vnfmHelper;
-        this.jobManager = jobManager;
-        this.packageProvider = packageProvider;
-    }
-
-    /**
-     * Create a VNF on a VNFM.
-     *
-     * @param vnfIdInAai the ID of the VNF in AAI
-     * @param request the create request
-     * @return the response to the request
-     */
-    public CreateVnfResponse createVnf(final String vnfIdInAai, final CreateVnfRequest request) {
-        final GenericVnf genericVnf = getGenericVnfFromAai(vnfIdInAai);
-        EsrVnfm vnfm = aaiHelper.getAssignedVnfm(genericVnf);
-        checkIfVnfAlreadyExistsInVnfm(vnfm, genericVnf);
-
-        if (vnfm == null) {
-            vnfm = aaiHelper.selectVnfm(genericVnf);
-            aaiServiceProvider.invokePutGenericVnfToVnfmRelationship(genericVnf, vnfm.getVnfmId());
-        }
-        final InlineResponse201 vnfmResponse = sendCreateRequestToVnfm(request, genericVnf, vnfIdInAai, vnfm);
-
-        logger.info("Create response: {}", vnfmResponse);
-
-        genericVnf.setSelflink(getSelfLink(vnfmResponse, vnfm));
-
-        final GenericVnf genericVnfPatch = new GenericVnf();
-        genericVnfPatch.setVnfId(genericVnf.getVnfId());
-        genericVnfPatch.setSelflink(genericVnf.getSelflink());
-        aaiServiceProvider.invokePatchGenericVnf(genericVnfPatch);
-
-        final String vnfIdInVnfm = vnfmResponse.getId();
-
-        final OamIpAddressSource oamIpAddressSource = extractOamIpAddressSource(request);
-        aaiHelper.setOamIpAddressSource(vnfIdInVnfm, oamIpAddressSource);
-
-        createNotificationSubscription(vnfm, vnfIdInVnfm);
-        final String operationId = sendInstantiateRequestToVnfm(vnfm, genericVnf, request);
-
-        final String jobId = jobManager.createJob(vnfm.getVnfmId(), operationId, false);
-        final CreateVnfResponse response = new CreateVnfResponse();
-        response.setJobId(jobId);
-        return response;
-    }
-
-    private String getSelfLink(final InlineResponse201 vnfmResponse, final EsrVnfm vnfm) {
-        if (vnfmResponse.getLinks() != null && vnfmResponse.getLinks().getSelf() != null
-                && vnfmResponse.getLinks().getSelf().getHref() != null) {
-            return vnfmResponse.getLinks().getSelf().getHref();
-        }
-        return vnfm.getEsrSystemInfoList().getEsrSystemInfo().iterator().next().getServiceUrl() + "/vnf_instances/"
-                + vnfmResponse.getId();
-    }
-
-    private OamIpAddressSource extractOamIpAddressSource(final CreateVnfRequest request) {
-        final Map<String, String> additionalParams = request.getAdditionalParams();
-        try {
-            final String sourceType = additionalParams.remove("oamIpAddressSourceType");
-            final String sourceValue = additionalParams.remove("oamIpAddressSourceValue");
-            final OamIpAddressType oamIpAddressType = OamIpAddressType.valueOf(sourceType.toUpperCase());
-            return new OamIpAddressSource(oamIpAddressType, sourceValue);
-        } catch (final NullPointerException | IllegalArgumentException exception) {
-            logger.debug("Additional Params not set for OAM IP address source", exception);
-            return null;
-        }
-    }
-
-    private void checkIfVnfAlreadyExistsInVnfm(final EsrVnfm vnfm, final GenericVnf genericVnf) {
-        if (genericVnf.getSelflink() != null && !genericVnf.getSelflink().isEmpty() && vnfm != null) {
-            Optional<InlineResponse201> response = Optional.absent();
-            try {
-                response = vnfmServiceProvider.getVnf(vnfm, genericVnf.getSelflink());
-            } catch (final Exception exception) {
-                logger.debug("Ignoring invalid self link in generic vnf", exception);
-            }
-            if (response.isPresent()) {
-                throw new IllegalArgumentException("VNF " + genericVnf.getVnfId()
-                        + " is already defined on the VNFM, self link: " + genericVnf.getSelflink());
-            }
-        }
-    }
-
-    private InlineResponse201 sendCreateRequestToVnfm(final CreateVnfRequest createVnfRequest,
-            final GenericVnf genericVnf, final String vnfIdInAai, final EsrVnfm vnfm) {
-        logger.debug("Sending a create request to SVNFM {}", createVnfRequest);
-        final org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.CreateVnfRequest vnfmRequest =
-                new org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.CreateVnfRequest();
-
-        final String pkgId = getPackageId(createVnfRequest, genericVnf);
-        final String vnfdId = packageProvider.getVnfdId(pkgId);
-        vnfmRequest.setVnfdId(vnfdId);
-        vnfmRequest.setVnfInstanceName(createVnfRequest.getName().replaceAll(" ", "_"));
-        vnfmRequest.setVnfInstanceDescription(vnfIdInAai);
-
-        final Optional<InlineResponse201> optionalResponse = vnfmServiceProvider.createVnf(vnfm, vnfmRequest);
-
-        try {
-            return optionalResponse.get();
-        } catch (final Exception exception) {
-            final String errorMessage = "Unable to return response from VNFM";
-            logger.error(errorMessage, exception);
-            throw new VnfmRequestFailureException(errorMessage, exception);
-        }
-    }
-
-    private String getPackageId(final CreateVnfRequest createVnfRequest, final GenericVnf genericVnf) {
-        if (isNotBlank(createVnfRequest.getPkgId())) {
-            logger.info("Found createVnfRequest pkgId: {}", createVnfRequest.getPkgId());
-            return createVnfRequest.getPkgId();
-        }
-        logger.info("Found genericVnf modelVersionId: {}", genericVnf.getModelVersionId());
-        return genericVnf.getModelVersionId();
-    }
-
-    private void createNotificationSubscription(final EsrVnfm vnfm, final String vnfId) {
-        try {
-            final LccnSubscriptionRequest subscriptionRequest = vnfmHelper.createNotificationSubscriptionRequest(vnfId);
-            vnfmServiceProvider.subscribeForNotifications(vnfm, subscriptionRequest);
-        } catch (final Exception exception) {
-            logger.warn("Subscription for notifications to VNFM: " + vnfm.getVnfmId() + " for VNF " + vnfId
-                    + " failed. AAI will not be updated unless the VNFM is configured by other means to send notifications relating to this VNF",
-                    exception);
-        }
-    }
-
-    private String sendInstantiateRequestToVnfm(final EsrVnfm vnfm, final GenericVnf genericVnf,
-            final CreateVnfRequest createVnfRequest) {
-
-        final String pkgId = getPackageId(createVnfRequest, genericVnf);
-        final InstantiateVnfRequest instantiateVnfRequest = vnfmHelper.createInstantiateRequest(
-                createVnfRequest.getTenant(), createVnfRequest, packageProvider.getFlavourId(pkgId));
-        final String jobId = vnfmServiceProvider.instantiateVnf(vnfm, genericVnf.getSelflink(), instantiateVnfRequest);
-
-        logger.info("Instantiate VNF request successfully sent to " + genericVnf.getSelflink());
-        return jobId;
-    }
-
-    /**
-     * Delete a VNF on a VNFM.
-     *
-     * @param vnfIdInAai the ID of the VNF in AAI
-     * @return the response to the request
-     */
-    public DeleteVnfResponse deleteVnf(final String vnfIdInAai) {
-        final GenericVnf genericVnf = getGenericVnfFromAai(vnfIdInAai);
-        final EsrVnfm vnfm = getAssignedVnfm(genericVnf);
-
-        final String operationId = sendTerminateRequestToVnfm(vnfm, genericVnf);
-
-        if (operationId.equals(JobManager.ALREADY_COMPLETED_OPERATION_ID)) {
-            sendDeleteRequestToVnfm(genericVnf);
-        }
-        final String jobId = jobManager.createJob(vnfm.getVnfmId(), operationId, true);
-
-        return new DeleteVnfResponse().jobId(jobId);
-    }
-
-    private String sendTerminateRequestToVnfm(final EsrVnfm vnfm, final GenericVnf genericVnf) {
-        final TerminateVnfRequest terminateVnfRequest = new TerminateVnfRequest();
-        terminateVnfRequest.setTerminationType(TerminationTypeEnum.FORCEFUL);
-        return vnfmServiceProvider.terminateVnf(vnfm, genericVnf.getSelflink(), terminateVnfRequest);
-    }
-
-    private GenericVnf getGenericVnfFromAai(final String vnfIdInAai) {
-        final GenericVnf genericVnf = aaiServiceProvider.invokeGetGenericVnf(vnfIdInAai);
-        if (genericVnf == null) {
-            throw new VnfNotFoundException("VNF not found in AAI: " + vnfIdInAai);
-        }
-        logger.debug("Retrieved generic VNF from AAI: " + genericVnf);
-        return genericVnf;
-    }
-
-    private EsrVnfm getAssignedVnfm(final GenericVnf genericVnf) {
-        final EsrVnfm vnfm = aaiHelper.getAssignedVnfm(genericVnf);
-        if (vnfm == null) {
-            throw new VnfmNotFoundException("No VNFM found in AAI for VNF " + genericVnf.getVnfId());
-        }
-        return vnfm;
-    }
-
-    private void sendDeleteRequestToVnfm(final GenericVnf genericVnf) {
-
-        vnfmServiceProvider.deleteVnf(aaiHelper.getAssignedVnfm(genericVnf), genericVnf.getSelflink());
-
-        final GenericVnf genericVnfPatch = new GenericVnf();
-        genericVnfPatch.setVnfId(genericVnf.getVnfId());
-        genericVnfPatch.setOrchestrationStatus("Assigned");
-        genericVnfPatch.setSelflink("");
-        aaiServiceProvider.invokePatchGenericVnf(genericVnfPatch);
-
-        for (final Relationship relationship : genericVnf.getRelationshipList().getRelationship()) {
-            if (relationship.getRelatedTo().equals("vserver")) {
-                aaiServiceProvider.invokeDeleteVserver(
-                        aaiHelper.getRelationshipData(relationship, "cloud-region.cloud-owner"),
-                        aaiHelper.getRelationshipData(relationship, "cloud-region.cloud-region-id"),
-                        aaiHelper.getRelationshipData(relationship, "tenant.tenant-id"),
-                        aaiHelper.getRelationshipData(relationship, "vserver.vserver-id"));
-            }
-        }
-
-
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/notificationhandling/NotificationHandler.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/notificationhandling/NotificationHandler.java
deleted file mode 100644
index f23fac8115..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/notificationhandling/NotificationHandler.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.notificationhandling;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource.OamIpAddressType;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201VimConnectionInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement.JobManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs.ChangeTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification.OperationStateEnum;
-import org.slf4j.Logger;
-
-/**
- * Performs updates to AAI based on a received notification. The updates are executed in a separate thread so as the
- * notification response to the VNFM is not delayed.
- */
-public class NotificationHandler implements Runnable {
-    private static Logger logger = getLogger(NotificationHandler.class);
-    private final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification;
-    private final AaiHelper aaiHelper;
-    private final AaiServiceProvider aaiServiceProvider;
-    private final VnfmServiceProvider vnfmServiceProvider;
-    private final JobManager jobManager;
-    private final InlineResponse201 vnfInstance;
-
-    public NotificationHandler(final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification,
-            final AaiHelper aaiHelper, final AaiServiceProvider aaiServiceProvider,
-            final VnfmServiceProvider vnfmServiceProvider, final JobManager jobManager,
-            final InlineResponse201 vnfInstance) {
-        this.vnfLcmOperationOccurrenceNotification = vnfLcmOperationOccurrenceNotification;
-        this.aaiHelper = aaiHelper;
-        this.aaiServiceProvider = aaiServiceProvider;
-        this.vnfmServiceProvider = vnfmServiceProvider;
-        this.jobManager = jobManager;
-        this.vnfInstance = vnfInstance;
-    }
-
-    @Override
-    public void run() {
-        try {
-            if (vnfLcmOperationOccurrenceNotification.getOperationState().equals(OperationStateEnum.COMPLETED)) {
-                switch (vnfLcmOperationOccurrenceNotification.getOperation()) {
-                    case INSTANTIATE:
-                        handleVnfInstantiate();
-                        break;
-                    case TERMINATE:
-                        handleVnfTerminate();
-                        break;
-                    default:
-                }
-            }
-        } catch (final Exception exception) {
-            logger.error("Error encountered handling notification, AAI may not be updated correctly "
-                    + vnfLcmOperationOccurrenceNotification, exception);
-        }
-    }
-
-    private void handleVnfInstantiate() {
-        if (vnfLcmOperationOccurrenceNotification.getOperationState().equals(OperationStateEnum.COMPLETED)) {
-            handleVnfInstantiateCompleted();
-        }
-    }
-
-    private void handleVnfInstantiateCompleted() {
-        final GenericVnf genericVnf = aaiServiceProvider
-                .invokeQueryGenericVnf(vnfInstance.getLinks().getSelf().getHref()).getGenericVnf().get(0);
-
-        final GenericVnf genericVnfPatch = new GenericVnf();
-        genericVnfPatch.setVnfId(genericVnf.getVnfId());
-        setOamIpAddress(genericVnfPatch, vnfInstance);
-        genericVnfPatch.setOrchestrationStatus("Created");
-        aaiServiceProvider.invokePatchGenericVnf(genericVnfPatch);
-
-        addVservers(vnfLcmOperationOccurrenceNotification, genericVnf.getVnfId(), vnfInstance.getVimConnectionInfo());
-
-        logger.debug("Finished handling notification for vnfm: " + vnfInstance.getId());
-    }
-
-    private void setOamIpAddress(final GenericVnf genericVnf, final InlineResponse201 vnfInstance) {
-        final OamIpAddressSource oamIpAddressSource = aaiHelper.getOamIpAddressSource(vnfInstance.getId());
-        if (oamIpAddressSource == null) {
-            logger.warn("No source indicated for OAM IP address, no value will be set in AAI");
-            return;
-        }
-        if (oamIpAddressSource.getType().equals(OamIpAddressType.LITERAL)) {
-            genericVnf.setIpv4OamAddress(oamIpAddressSource.getValue());
-        } else {
-            try {
-                logger.debug("ConfigurableProperties: " + vnfInstance.getVnfConfigurableProperties());
-                if (vnfInstance.getVnfConfigurableProperties() == null) {
-                    logger.warn("No ConfigurableProperties, cannot set OAM IP Address");
-                }
-                final JSONObject properties = new JSONObject((Map) vnfInstance.getVnfConfigurableProperties());
-                genericVnf.setIpv4OamAddress(properties.get(oamIpAddressSource.getValue()).toString());
-            } catch (final JSONException jsonException) {
-                logger.error("Error getting vnfIpAddress", jsonException);
-            }
-        }
-    }
-
-    private void handleVnfTerminate() {
-        switch (vnfLcmOperationOccurrenceNotification.getOperationState()) {
-            case COMPLETED:
-                handleVnfTerminateCompleted();
-                break;
-            case FAILED:
-            case ROLLING_BACK:
-                handleVnfTerminateFailed();
-                break;
-            default:
-        }
-    }
-
-    private void handleVnfTerminateFailed() {
-        try {
-            final GenericVnf genericVnf = aaiServiceProvider
-                    .invokeQueryGenericVnf(vnfInstance.getLinks().getSelf().getHref()).getGenericVnf().get(0);
-            deleteVserversFromAai(vnfLcmOperationOccurrenceNotification, genericVnf);
-        } finally {
-            jobManager.notificationProcessedForOperation(vnfLcmOperationOccurrenceNotification.getVnfLcmOpOccId(),
-                    false);
-        }
-    }
-
-    private void handleVnfTerminateCompleted() {
-        GenericVnf genericVnf = null;
-        boolean vServersDeletedFromAai = false;
-        boolean identifierDeletedFromVnfm = false;
-        boolean genericVnfUpdated = false;
-        try {
-            genericVnf = aaiServiceProvider.invokeQueryGenericVnf(vnfInstance.getLinks().getSelf().getHref())
-                    .getGenericVnf().get(0);
-            vServersDeletedFromAai = deleteVserversFromAai(vnfLcmOperationOccurrenceNotification, genericVnf);
-            identifierDeletedFromVnfm = deleteVnfIdentifierOnVnfm(genericVnf);
-            genericVnfUpdated = patchVnfInAai(genericVnf.getVnfId(), "Assigned", identifierDeletedFromVnfm ? "" : null);
-        } finally {
-            jobManager.notificationProcessedForOperation(vnfLcmOperationOccurrenceNotification.getVnfLcmOpOccId(),
-                    vServersDeletedFromAai && identifierDeletedFromVnfm && genericVnfUpdated);
-            jobManager.vnfDeleted(vnfLcmOperationOccurrenceNotification.getVnfLcmOpOccId());
-        }
-    }
-
-    private void addVservers(final VnfLcmOperationOccurrenceNotification notification, final String vnfId,
-            final List<InlineResponse201VimConnectionInfo> vnfInstancesVimConnectionInfo) {
-        final Map<String, InlineResponse201VimConnectionInfo> vimConnectionIdToVimConnectionInfo = new HashMap<>();
-        for (final InlineResponse201VimConnectionInfo vimConnectionInfo : vnfInstancesVimConnectionInfo) {
-            vimConnectionIdToVimConnectionInfo.put(vimConnectionInfo.getId(), vimConnectionInfo);
-        }
-
-        for (final LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs vnfc : notification.getAffectedVnfcs()) {
-            final InlineResponse201VimConnectionInfo vimConnectionInfo =
-                    getVimConnectionInfo(vimConnectionIdToVimConnectionInfo, vnfc);
-            if (ChangeTypeEnum.ADDED.equals(vnfc.getChangeType())) {
-                final Vserver vserver = aaiHelper.createVserver(vnfc);
-                aaiServiceProvider.invokePutVserver(getCloudOwner(vimConnectionInfo), getCloudRegion(vimConnectionInfo),
-                        getTenant(vimConnectionInfo), vserver);
-
-                aaiServiceProvider.invokePutVserverToVnfRelationship(getCloudOwner(vimConnectionInfo),
-                        getCloudRegion(vimConnectionInfo), getTenant(vimConnectionInfo), vserver, vnfId);
-            }
-        }
-    }
-
-    private boolean deleteVserversFromAai(final VnfLcmOperationOccurrenceNotification notification,
-            final GenericVnf vnf) {
-        try {
-            for (final LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs vnfc : notification.getAffectedVnfcs()) {
-                if (ChangeTypeEnum.REMOVED.equals(vnfc.getChangeType())) {
-
-                    final Relationship relationshipToVserver = aaiHelper.deleteRelationshipWithDataValue(vnf, "vserver",
-                            "vserver.vserver-id", vnfc.getComputeResource().getResourceId());
-
-                    aaiServiceProvider.invokeDeleteVserver(
-                            aaiHelper.getRelationshipData(relationshipToVserver, "cloud-region.cloud-owner"),
-                            aaiHelper.getRelationshipData(relationshipToVserver, "cloud-region.cloud-region-id"),
-                            aaiHelper.getRelationshipData(relationshipToVserver, "tenant.tenant-id"),
-                            vnfc.getComputeResource().getResourceId());
-                }
-            }
-            return true;
-        } catch (final Exception exception) {
-            logger.error(
-                    "Error encountered deleting vservers based on received notification, AAI may not be updated correctly "
-                            + vnfLcmOperationOccurrenceNotification,
-                    exception);
-            return false;
-        }
-    }
-
-    private boolean deleteVnfIdentifierOnVnfm(final GenericVnf genericVnf) {
-        try {
-            vnfmServiceProvider.deleteVnf(aaiHelper.getAssignedVnfm(genericVnf), genericVnf.getSelflink());
-            return true;
-        } catch (final Exception exception) {
-            logger.error("Exception deleting the identifier " + genericVnf.getSelflink()
-                    + " from the VNFM. The VNF has been terminated successfully but the identifier will remain on the VNFM.",
-                    exception);
-            return false;
-        }
-    }
-
-    private boolean patchVnfInAai(final String vnfId, final String orchestrationStatus, final String selfLink) {
-        try {
-            final GenericVnf genericVnfPatch = new GenericVnf();
-            genericVnfPatch.setVnfId(vnfId);
-            genericVnfPatch.setOrchestrationStatus(orchestrationStatus);
-            if (selfLink != null) {
-                genericVnfPatch.setSelflink(selfLink);
-            }
-            aaiServiceProvider.invokePatchGenericVnf(genericVnfPatch);
-            return true;
-        } catch (final Exception exception) {
-            logger.error(
-                    "Error encountered setting orchestration status and/or self link based on received notification, AAI may not be updated correctly "
-                            + vnfLcmOperationOccurrenceNotification,
-                    exception);
-            return false;
-        }
-    }
-
-    private InlineResponse201VimConnectionInfo getVimConnectionInfo(
-            final Map<String, InlineResponse201VimConnectionInfo> vimConnectionIdToVimConnectionInfo,
-            final LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs vnfc) {
-        final String vimConnectionId = vnfc.getComputeResource().getVimConnectionId();
-        return vimConnectionIdToVimConnectionInfo.get(vimConnectionId);
-    }
-
-    private String getCloudOwner(final InlineResponse201VimConnectionInfo vimConnectionInfo) {
-        final String vimId = vimConnectionInfo.getVimId();
-        return vimId.substring(0, vimId.indexOf("_"));
-    }
-
-    private String getCloudRegion(final InlineResponse201VimConnectionInfo vimConnectionInfo) {
-        final String vimId = vimConnectionInfo.getVimId();
-        return vimId.substring(vimId.indexOf("_") + 1);
-    }
-
-    private String getTenant(final InlineResponse201VimConnectionInfo vimConnectionInfo) {
-        final JSONObject vimConnectionJsonObject = new JSONObject(vimConnectionInfo);
-        return vimConnectionJsonObject.getJSONObject("accessInfo").get("projectId").toString();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterController.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterController.java
deleted file mode 100644
index 70131c89a5..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterController.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.BASE_URL;
-import javax.validation.Valid;
-import javax.ws.rs.core.MediaType;
-import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement.JobManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.lifecycle.LifecycleManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.DeleteVnfResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.QueryJobResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiParam;
-
-/**
- * Controller for handling requests to the VNFM (Virtual Network Function Manager) adapter REST API.
- */
-@Controller
-@RequestMapping(value = BASE_URL, produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-        consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class EtsiSol003AdapterController {
-
-    private static final Logger logger = LoggerFactory.getLogger(EtsiSol003AdapterController.class);
-    private final LifecycleManager lifecycleManager;
-    private final JobManager jobManager;
-
-    @Autowired
-    EtsiSol003AdapterController(final LifecycleManager lifecycleManager, final JobManager jobManager) {
-        this.lifecycleManager = lifecycleManager;
-        this.jobManager = jobManager;
-    }
-
-    @PostMapping(value = "/vnfs/{vnfId}")
-    public ResponseEntity<CreateVnfResponse> vnfCreate(
-            @ApiParam(value = "The identifier of the VNF. This must be the vnf-id of an existing generic-vnf in AAI.",
-                    required = true) @PathVariable("vnfId") final String vnfId,
-            @ApiParam(value = "VNF creation parameters",
-                    required = true) @Valid @RequestBody final CreateVnfRequest createVnfRequest,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single top level invocation of ONAP",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.REQUEST_ID,
-                            required = false) final String requestId,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies the client application user agent or user invoking the API",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.PARTNER_NAME,
-                            required = false) final String partnerName,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single invocation of a single component",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.INVOCATION_ID,
-                            required = false) final String invocationId) {
-
-        setLoggingMDCs(requestId, partnerName, invocationId);
-
-        logger.info("REST request vnfCreate with body: {}", createVnfRequest);
-
-        try {
-            final CreateVnfResponse createVnfResponse = lifecycleManager.createVnf(vnfId, createVnfRequest);
-            return new ResponseEntity<>(createVnfResponse, HttpStatus.ACCEPTED);
-        } finally {
-            clearLoggingMDCs();
-        }
-    }
-
-    @DeleteMapping(value = "/vnfs/{vnfId}")
-    public ResponseEntity<DeleteVnfResponse> vnfDelete(
-            @ApiParam(value = "The identifier of the VNF. This must be the vnf-id of an existing generic-vnf in AAI.",
-                    required = true) @PathVariable("vnfId") final String vnfId,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single top level invocation of ONAP",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.REQUEST_ID,
-                            required = false) final String requestId,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies the client application user agent or user invoking the API",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.PARTNER_NAME,
-                            required = false) final String partnerName,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single invocation of a single component",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.INVOCATION_ID,
-                            required = false) final String invocationId) {
-
-        setLoggingMDCs(requestId, partnerName, invocationId);
-
-        logger.info("REST request vnfDelete for VNF: {}", vnfId);
-
-        try {
-            final DeleteVnfResponse response = lifecycleManager.deleteVnf(vnfId);
-            return new ResponseEntity<>(response, HttpStatus.ACCEPTED);
-        } finally {
-            clearLoggingMDCs();
-        }
-    }
-
-    @GetMapping(value = "/jobs/{jobId}")
-    public ResponseEntity<QueryJobResponse> jobQuery(
-            @ApiParam(value = "The identifier of the Job.", required = true) @PathVariable("jobId") final String jobId,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single top level invocation of ONAP",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.REQUEST_ID,
-                            required = false) final String requestId,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies the client application user agent or user invoking the API",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.PARTNER_NAME,
-                            required = false) final String partnerName,
-            @ApiParam(
-                    value = "Used to track REST requests for logging purposes. Identifies a single invocation of a single component",
-                    required = false) @RequestHeader(value = ONAPLogConstants.Headers.INVOCATION_ID,
-                            required = false) final String invocationId) {
-
-        setLoggingMDCs(requestId, partnerName, invocationId);
-
-        try {
-            final QueryJobResponse response = jobManager.getVnfmOperation(jobId);
-            return new ResponseEntity<>(response, HttpStatus.OK);
-        } finally {
-            clearLoggingMDCs();
-        }
-    }
-
-    private void setLoggingMDCs(final String requestId, final String partnerName, final String invocationId) {
-        MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);
-        MDC.put(ONAPLogConstants.MDCs.PARTNER_NAME, partnerName);
-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationId);
-    }
-
-    private void clearLoggingMDCs() {
-        MDC.clear();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantController.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantController.java
deleted file mode 100644
index 8a17b68fae..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantController.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.BASE_URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import javax.ws.rs.core.MediaType;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantsAddResources;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201AddResources;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201VimConnections;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping(value = BASE_URL, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
-public class Sol003GrantController {
-
-    private static final Logger logger = LoggerFactory.getLogger(Sol003GrantController.class);
-    public final AaiServiceProvider aaiServiceProvider;
-    public final AaiHelper aaiHelper;
-    public final VnfmHelper vnfmHelper;
-
-    @Autowired
-    public Sol003GrantController(final AaiServiceProvider aaiServiceProvider, final AaiHelper aaiHelper,
-            final VnfmHelper vnfmHelper) {
-        this.aaiServiceProvider = aaiServiceProvider;
-        this.aaiHelper = aaiHelper;
-        this.vnfmHelper = vnfmHelper;
-    }
-
-    @GetMapping(value = "/grants/{grantId}")
-    public ResponseEntity<InlineResponse201> grantsGrantIdGet(@PathVariable("grantId") final String grantId) {
-        logger.info("Get grant received from VNFM, grant id: " + grantId);
-        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
-    }
-
-    @PostMapping(value = "/grants")
-    public ResponseEntity<InlineResponse201> grantsPost(@RequestBody final GrantRequest grantRequest) {
-        logger.info("Grant request received from VNFM: " + grantRequest);
-
-        final InlineResponse201 grantResponse = createGrantResponse(grantRequest);
-        logger.info("Grant request returning to VNFM: " + grantResponse);
-        return new ResponseEntity<>(grantResponse, HttpStatus.CREATED);
-    }
-
-    private InlineResponse201 createGrantResponse(final GrantRequest grantRequest) {
-        final InlineResponse201 grantResponse = new InlineResponse201();
-        grantResponse.setId(UUID.randomUUID().toString());
-        grantResponse.setVnfInstanceId(grantRequest.getVnfInstanceId());
-        grantResponse.setVnfLcmOpOccId(grantRequest.getVnfLcmOpOccId());
-        final String vnfSelfLink = grantRequest.getLinks().getVnfInstance().getHref();
-        final Tenant tenant = aaiHelper
-                .getAssignedTenant(aaiServiceProvider.invokeQueryGenericVnf(vnfSelfLink).getGenericVnf().get(0));
-
-        String vimConnectionId = "";
-        final InlineResponse201VimConnections vimConnection = vnfmHelper.getVimConnections(tenant);
-        grantResponse.addVimConnectionsItem(vimConnection);
-        vimConnectionId = vimConnection.getId();
-
-        if (grantRequest.getOperation().equals(GrantRequest.OperationEnum.INSTANTIATE)) {
-            grantResponse.addResources(getResources(grantRequest.getAddResources(), vimConnectionId));
-        } else if (grantRequest.getOperation().equals(GrantRequest.OperationEnum.TERMINATE)) {
-            grantResponse.removeResources(getResources(grantRequest.getRemoveResources(), vimConnectionId));
-        }
-        return grantResponse;
-    }
-
-    private List<InlineResponse201AddResources> getResources(final List<GrantsAddResources> requestResources,
-            final String vimId) {
-        final List<InlineResponse201AddResources> resources = new ArrayList<>();
-        for (final GrantsAddResources requestResource : requestResources) {
-            final InlineResponse201AddResources responseResource = new InlineResponse201AddResources();
-            responseResource.setResourceDefinitionId(requestResource.getId());
-            responseResource.setVimConnectionId(vimId);
-            resources.add(responseResource);
-        }
-        return resources;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnContoller.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnContoller.java
deleted file mode 100644
index 784fb8efa6..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnContoller.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.BASE_URL;
-import static org.onap.so.adapters.etsisol003adapter.lcm.LifeCycleManagementConstants.OPERATION_NOTIFICATION_ENDPOINT;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import javax.ws.rs.core.MediaType;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.jobmanagement.JobManager;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfIdentifierCreationNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfIdentifierDeletionNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification.OperationEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification.OperationStateEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.notificationhandling.NotificationHandler;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Controller for handling notifications from the VNFM (Virtual Network Function Manager).
- */
-@Controller
-@RequestMapping(value = BASE_URL, produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-        consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class Sol003LcnContoller {
-    private static Logger logger = getLogger(Sol003LcnContoller.class);
-    private static final String LOG_LCN_RECEIVED = "LCN received from VNFM: ";
-    private final AaiServiceProvider aaiServiceProvider;
-    private final AaiHelper aaiHelper;
-    private final VnfmServiceProvider vnfmServiceProvider;
-    private final JobManager jobManager;
-    private final ExecutorService executor = Executors.newCachedThreadPool();
-
-    @Autowired
-    Sol003LcnContoller(final AaiServiceProvider aaiServiceProvider, final AaiHelper aaiHelper,
-            final VnfmServiceProvider vnfmServiceProvider, final JobManager jobManager) {
-        this.aaiServiceProvider = aaiServiceProvider;
-        this.aaiHelper = aaiHelper;
-        this.vnfmServiceProvider = vnfmServiceProvider;
-        this.jobManager = jobManager;
-    }
-
-    @PostMapping(value = "/lcn/VnfIdentifierCreationNotification")
-    public ResponseEntity<Void> lcnVnfIdentifierCreationNotificationPost(
-            @RequestBody final VnfIdentifierCreationNotification vnfIdentifierCreationNotification) {
-        logger.info(LOG_LCN_RECEIVED + vnfIdentifierCreationNotification);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping(value = "/lcn/VnfIdentifierDeletionNotification")
-    public ResponseEntity<Void> lcnVnfIdentifierDeletionNotificationPost(
-            @RequestBody final VnfIdentifierDeletionNotification vnfIdentifierDeletionNotification) {
-        logger.info(LOG_LCN_RECEIVED + vnfIdentifierDeletionNotification);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping(value = OPERATION_NOTIFICATION_ENDPOINT)
-    public ResponseEntity<Void> lcnVnfLcmOperationOccurrenceNotificationPost(
-            @RequestBody final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification) {
-        logger.info(LOG_LCN_RECEIVED + vnfLcmOperationOccurrenceNotification);
-
-        if (isANotificationOfInterest(vnfLcmOperationOccurrenceNotification)) {
-            final InlineResponse201 vnfInstance = getVnfInstance(vnfLcmOperationOccurrenceNotification);
-            final NotificationHandler handler = new NotificationHandler(vnfLcmOperationOccurrenceNotification,
-                    aaiHelper, aaiServiceProvider, vnfmServiceProvider, jobManager, vnfInstance);
-            executor.execute(handler);
-        }
-
-        logger.info("Sending notification response");
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    private boolean isANotificationOfInterest(final VnfLcmOperationOccurrenceNotification notification) {
-        return isInstanitiateCompleted(notification) || isTerminateTerminalState(notification);
-    }
-
-    private boolean isInstanitiateCompleted(final VnfLcmOperationOccurrenceNotification notification) {
-        return notification.getOperation().equals(OperationEnum.INSTANTIATE)
-                && notification.getOperationState().equals(OperationStateEnum.COMPLETED);
-    }
-
-    private boolean isTerminateTerminalState(final VnfLcmOperationOccurrenceNotification notification) {
-        return notification.getOperation().equals(OperationEnum.TERMINATE)
-                && (notification.getOperationState().equals(OperationStateEnum.COMPLETED)
-                        || notification.getOperationState().equals(OperationStateEnum.FAILED)
-                        || notification.getOperationState().equals(OperationStateEnum.ROLLED_BACK));
-    }
-
-    private InlineResponse201 getVnfInstance(
-            final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification) {
-        final GenericVnf vnfInAai = aaiServiceProvider
-                .invokeQueryGenericVnf(vnfLcmOperationOccurrenceNotification.getLinks().getVnfInstance().getHref())
-                .getGenericVnf().get(0);
-        final EsrVnfm vnfm = aaiHelper.getAssignedVnfm(vnfInAai);
-        return vnfmServiceProvider
-                .getVnf(vnfm, vnfLcmOperationOccurrenceNotification.getLinks().getVnfInstance().getHref()).get();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/JobNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/JobNotFoundException.java
deleted file mode 100644
index 2461631bc4..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/JobNotFoundException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for job not found.
- */
-@ResponseStatus(HttpStatus.NOT_FOUND)
-public class JobNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 6398018034431666933L;
-
-    public JobNotFoundException(final String message) {
-        super(message);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/TenantNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/TenantNotFoundException.java
deleted file mode 100644
index b7911c82e7..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/TenantNotFoundException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions;
-
-/**
- * Exception for Tenant not found.
- */
-
-public class TenantNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 6398018034431666933L;
-
-    public TenantNotFoundException(final String message) {
-        super(message);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfNotFoundException.java
deleted file mode 100644
index 78232e2622..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfNotFoundException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for VNF not found.
- */
-@ResponseStatus(HttpStatus.NOT_FOUND)
-public class VnfNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 6398018034431666933L;
-
-    public VnfNotFoundException(final String message) {
-        super(message);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmNotFoundException.java
deleted file mode 100644
index 6720d0bd92..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmNotFoundException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for VNFM not found.
- */
-@ResponseStatus(HttpStatus.BAD_REQUEST)
-public class VnfmNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 6398018034431666933L;
-
-    public VnfmNotFoundException(final String message) {
-        super(message);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmRequestFailureException.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmRequestFailureException.java
deleted file mode 100644
index 10ada7ce18..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/exceptions/VnfmRequestFailureException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions;
-
-/**
- * Exception indicating a request to a VNFM failed.
- */
-public class VnfmRequestFailureException extends RuntimeException {
-
-    private static final long serialVersionUID = 6398018034431666933L;
-
-    public VnfmRequestFailureException(final String message) {
-        super(message);
-    }
-
-    public VnfmRequestFailureException(final String message, final Throwable throwable) {
-        super(message, throwable);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/resources/META-INF/services/org.onap.so.client.RestProperties b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/resources/META-INF/services/org.onap.so.client.RestProperties
deleted file mode 100644
index bc6ef94f42..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/resources/META-INF/services/org.onap.so.client.RestProperties
+++ /dev/null
@@ -1 +0,0 @@
-org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiPropertiesImpl
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterControllerTest.java
deleted file mode 100644
index 5bc4daac42..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/EtsiSol003AdapterControllerTest.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmRestTemplateConfiguration;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withBadRequest;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-import java.net.URI;
-import java.util.Optional;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.hamcrest.MockitoHamcrest;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.EsrVnfmList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.onap.aaiclient.client.aai.AAIVersion;
-import org.onap.aaiclient.client.aai.entities.uri.AAIBaseResourceUri;
-import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.EtsiPackageProvider;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmRestTemplateConfiguration;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201.InstantiationStateEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201Links;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201LinksSelf;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.JSON;
-import org.onap.so.adapters.etsisol003adapter.lcm.rest.exceptions.VnfmNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.CreateVnfResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.DeleteVnfResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.OperationStateEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.QueryJobResponse;
-import org.onap.so.adapters.etsisol003adapter.lcm.v1.model.Tenant;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
-import org.threeten.bp.LocalDateTime;
-import org.threeten.bp.OffsetDateTime;
-import org.threeten.bp.ZoneOffset;
-import com.google.gson.Gson;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class EtsiSol003AdapterControllerTest {
-
-    private static final OffsetDateTime JAN_1_2019_12_00 =
-            OffsetDateTime.of(LocalDateTime.of(2019, 1, 1, 12, 0), ZoneOffset.UTC);
-    private static final OffsetDateTime JAN_1_2019_1_00 =
-            OffsetDateTime.of(LocalDateTime.of(2019, 1, 1, 1, 0), ZoneOffset.UTC);
-    private static final String CLOUD_OWNER = "myTestCloudOwner";
-    private static final String REGION = "myTestRegion";
-    private static final String TENANT_ID = "myTestTenantId";
-
-    @LocalServerPort
-    private int port;
-    @Autowired
-    @Qualifier(VnfmRestTemplateConfiguration.SOL003_LCM_REST_TEMPLATE)
-    private RestTemplate testRestTemplate;
-    private MockRestServiceServer mockRestServer;
-
-    @MockBean
-    AAIResourcesClient aaiResourcesClient;
-
-    @MockBean
-    EtsiPackageProvider etsiPackageProvider;
-
-    @Autowired
-    EtsiSol003AdapterController controller;
-    Gson gson = new JSON().getGson();
-
-    @Before
-    public void setUp() throws Exception {
-        mockRestServer = MockRestServiceServer.bindTo(testRestTemplate).build();
-    }
-
-    @Test
-    public void createVnf_ValidRequest_Returns202AndJobId() throws Exception {
-        final Tenant tenant = new Tenant().cloudOwner(CLOUD_OWNER).regionName(REGION).tenantId(TENANT_ID);
-        final CreateVnfRequest createVnfRequest = new CreateVnfRequest().name("myTestName").tenant(tenant);
-
-        setUpGenericVnfInMockAai("vnfmType2");
-        setUpVnfmsInMockAai();
-        setUpVimInMockAai();
-
-        final String expectedsubscriptionRequest =
-                "{\"filter\":{\"vnfInstanceSubscriptionFilter\":{\"vnfInstanceIds\":[\"vnfId\"]},\"notificationTypes\":[\"VnfLcmOperationOccurrenceNotification\"]},\"callbackUri\":\"https://so-vnfm-adapter.onap:30406/so/vnfm-adapter/v1/lcn/VnfLcmOperationOccurrenceNotification\",\"authentication\":{\"authType\":[\"OAUTH2_CLIENT_CREDENTIALS\", \"BASIC\", \"TLS_CERT\"],\"paramsOauth2ClientCredentials\":{\"clientId\":\"vnfm\",\"clientPassword\":\"password1$\",\"tokenEndpoint\":\"https://so-vnfm-adapter.onap:30406/oauth/token\"},\"paramsBasic\":{\"userName\":\"vnfm\",\"password\":\"password1$\"}}}";
-        final InlineResponse2001 subscriptionResponse = new InlineResponse2001();
-
-        final InlineResponse201 createResponse = createCreateResponse();
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_instances"))
-                .andRespond(withSuccess(gson.toJson(createResponse), MediaType.APPLICATION_JSON));
-
-        mockRestServer.expect(requestTo("http://vnfm2:8080/subscriptions"))
-                .andExpect(content().json(expectedsubscriptionRequest))
-                .andRespond(withSuccess(gson.toJson(subscriptionResponse), MediaType.APPLICATION_JSON));
-
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_instances/vnfId/instantiate"))
-                .andRespond(withStatus(HttpStatus.ACCEPTED).contentType(MediaType.APPLICATION_JSON)
-                        .location(new URI("http://vnfm2:8080/vnf_lcm_op_occs/123456")));
-
-        final InlineResponse200 firstOperationQueryResponse = createOperationQueryResponse(
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationEnum.INSTANTIATE,
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationStateEnum.PROCESSING);
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_lcm_op_occs/123456"))
-                .andRespond(withSuccess(gson.toJson(firstOperationQueryResponse), MediaType.APPLICATION_JSON));
-
-        final InlineResponse200 secondOperationQueryReponse = createOperationQueryResponse(
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationEnum.INSTANTIATE,
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationStateEnum.COMPLETED);
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_lcm_op_occs/123456"))
-                .andRespond(withSuccess(gson.toJson(secondOperationQueryReponse), MediaType.APPLICATION_JSON));
-
-        // Invoke the create request
-
-        final ResponseEntity<CreateVnfResponse> createVnfResponse =
-                controller.vnfCreate("myTestVnfId", createVnfRequest, "asadas", "so", "1213");
-        assertEquals(HttpStatus.ACCEPTED, createVnfResponse.getStatusCode());
-        assertNotNull(createVnfResponse.getBody().getJobId());
-
-        final ArgumentCaptor<GenericVnf> genericVnfArgument = ArgumentCaptor.forClass(GenericVnf.class);
-        final ArgumentCaptor<AAIResourceUri> uriArgument = ArgumentCaptor.forClass(AAIResourceUri.class);
-
-        verify(aaiResourcesClient).update(uriArgument.capture(), genericVnfArgument.capture());
-
-        assertEquals("/network/generic-vnfs/generic-vnf/myTestVnfId", uriArgument.getValue().build().toString());
-
-        assertEquals("myTestVnfId", genericVnfArgument.getValue().getVnfId());
-
-        final ArgumentCaptor<AAIResourceUri> uriArgument1Connect = ArgumentCaptor.forClass(AAIResourceUri.class);
-        final ArgumentCaptor<AAIResourceUri> uriArgument2Connect = ArgumentCaptor.forClass(AAIResourceUri.class);
-        verify(aaiResourcesClient, timeout(1000)).connect(uriArgument1Connect.capture(), uriArgument2Connect.capture());
-        assertEquals("/external-system/esr-vnfm-list/esr-vnfm/vnfm2",
-                uriArgument1Connect.getAllValues().get(0).build().toString());
-        assertEquals("/network/generic-vnfs/generic-vnf/myTestVnfId",
-                uriArgument2Connect.getAllValues().get(0).build().toString());
-
-        // check the job status
-
-        final ResponseEntity<QueryJobResponse> firstJobQueryResponse =
-                controller.jobQuery(createVnfResponse.getBody().getJobId(), "", "so", "1213");
-        assertEquals(OperationEnum.INSTANTIATE, firstJobQueryResponse.getBody().getOperation());
-        assertEquals(OperationStateEnum.PROCESSING, firstJobQueryResponse.getBody().getOperationState());
-        assertEquals(JAN_1_2019_12_00, firstJobQueryResponse.getBody().getStartTime());
-        assertEquals(JAN_1_2019_1_00, firstJobQueryResponse.getBody().getStateEnteredTime());
-
-        final ResponseEntity<QueryJobResponse> secondJobQueryResponse =
-                controller.jobQuery(createVnfResponse.getBody().getJobId(), "", "so", "1213");
-        assertEquals(OperationEnum.INSTANTIATE, secondJobQueryResponse.getBody().getOperation());
-        assertEquals(OperationStateEnum.COMPLETED, secondJobQueryResponse.getBody().getOperationState());
-        assertEquals(JAN_1_2019_12_00, secondJobQueryResponse.getBody().getStartTime());
-        assertEquals(JAN_1_2019_1_00, secondJobQueryResponse.getBody().getStateEnteredTime());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void createVnf_VnfAlreadyExistsOnVnfm_ThrowsIllegalArgumentException() throws Exception {
-        final Tenant tenant = new Tenant().cloudOwner(CLOUD_OWNER).regionName(REGION).tenantId(TENANT_ID);
-        final CreateVnfRequest createVnfRequest = new CreateVnfRequest().name("myTestName").tenant(tenant);
-
-        final GenericVnf genericVnf = setUpGenericVnfInMockAai("vnfmType1");
-        addSelfLinkToGenericVnf(genericVnf);
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        setUpVnfmsInMockAai();
-
-        final InlineResponse201 reponse = new InlineResponse201();
-        mockRestServer.expect(requestTo(new URI("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")))
-                .andRespond(withSuccess(gson.toJson(reponse), MediaType.APPLICATION_JSON));
-
-        controller.vnfCreate("myTestVnfId", createVnfRequest, "asadas", "so", "1213");
-    }
-
-    @Test(expected = VnfmNotFoundException.class)
-    public void createVnf_NoMatchingVnfmFound_ThrowsException() throws Exception {
-        final Tenant tenant = new Tenant().cloudOwner(CLOUD_OWNER).regionName(REGION).tenantId(TENANT_ID);
-        final CreateVnfRequest createVnfRequest = new CreateVnfRequest().name("myTestName").tenant(tenant);
-
-        setUpGenericVnfInMockAai("anotherType");
-        setUpVnfmsInMockAai();
-
-        controller.vnfCreate("myTestVnfId", createVnfRequest, "asadas", "so", "1213");
-    }
-
-    @Test
-    public void createVnf_VnfmAlreadyAssociatedWithVnf_Returns202AndJobId() throws Exception {
-        final Tenant tenant = new Tenant().cloudOwner(CLOUD_OWNER).regionName(REGION).tenantId(TENANT_ID);
-        final CreateVnfRequest createVnfRequest = new CreateVnfRequest().name("myTestName").tenant(tenant);
-
-        final GenericVnf genericVnf = setUpGenericVnfInMockAai("vnfmType2");
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm2");
-        setUpVnfmsInMockAai();
-        setUpVimInMockAai();
-
-        final InlineResponse201 createResponse = createCreateResponse();
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_instances"))
-                .andRespond(withSuccess(gson.toJson(createResponse), MediaType.APPLICATION_JSON));
-
-        mockRestServer.expect(requestTo("http://vnfm2:8080/subscriptions")).andRespond(withBadRequest());
-
-        mockRestServer.expect(requestTo("http://vnfm2:8080/vnf_instances/vnfId/instantiate"))
-                .andRespond(withStatus(HttpStatus.ACCEPTED).contentType(MediaType.APPLICATION_JSON)
-                        .location(new URI("http://vnfm2:8080/vnf_lcm_op_occs/123456")));
-
-        final ResponseEntity<CreateVnfResponse> response =
-                controller.vnfCreate("myTestVnfId", createVnfRequest, "asadas", "so", "1213");
-        assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
-        assertNotNull(response.getBody().getJobId());
-    }
-
-    @Test
-    @Ignore
-    public void createVnf_UnauthorizedUser_Returns401() throws Exception {
-        final TestRestTemplate restTemplateWrongPassword = new TestRestTemplate("test", "wrongPassword");
-        final Tenant tenant = new Tenant().cloudOwner(CLOUD_OWNER).regionName(REGION).tenantId(TENANT_ID);
-        final CreateVnfRequest createVnfRequest = new CreateVnfRequest().name("myTestName").tenant(tenant);
-
-        final RequestEntity<CreateVnfRequest> request =
-                RequestEntity.post(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myVnfId"))
-                        .accept(MediaType.APPLICATION_JSON).contentType(MediaType.APPLICATION_JSON)
-                        .header("X-ONAP-RequestId", "myRequestId").header("X-ONAP-InvocationID", "myInvocationId")
-                        .body(createVnfRequest);
-        final ResponseEntity<CreateVnfResponse> response =
-                restTemplateWrongPassword.exchange(request, CreateVnfResponse.class);
-        assertEquals(401, response.getStatusCode().value());
-    }
-
-    @Test
-    public void deleteVnf_ValidRequest_Returns202AndJobId() throws Exception {
-        final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-        final GenericVnf genericVnf = setUpGenericVnfInMockAai("vnfmType1");
-        addSelfLinkToGenericVnf(genericVnf);
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        setUpVnfmsInMockAai();
-
-        mockRestServer.expect(requestTo("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm/terminate"))
-                .andRespond(withStatus(HttpStatus.ACCEPTED).contentType(MediaType.APPLICATION_JSON)
-                        .location(new URI("http://vnfm1:8080/vnf_lcm_op_occs/1234567")));
-
-        final InlineResponse200 firstOperationQueryResponse = createOperationQueryResponse(
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationEnum.TERMINATE,
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationStateEnum.PROCESSING);
-        mockRestServer.expect(requestTo("http://vnfm1:8080/vnf_lcm_op_occs/1234567"))
-                .andRespond(withSuccess(gson.toJson(firstOperationQueryResponse), MediaType.APPLICATION_JSON));
-
-        final InlineResponse200 secondOperationQueryReponse = createOperationQueryResponse(
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationEnum.TERMINATE,
-                org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationStateEnum.COMPLETED);
-        mockRestServer.expect(requestTo("http://vnfm1:8080/vnf_lcm_op_occs/1234567"))
-                .andRespond(withSuccess(gson.toJson(secondOperationQueryReponse), MediaType.APPLICATION_JSON));
-
-        final RequestEntity<Void> request = RequestEntity
-                .delete(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myTestVnfId"))
-                .accept(MediaType.APPLICATION_JSON).header("X-ONAP-RequestId", "myRequestId")
-                .header("X-ONAP-InvocationID", "myInvocationId").header("Content-Type", "application/json").build();
-        final ResponseEntity<DeleteVnfResponse> deleteVnfResponse =
-                restTemplate.exchange(request, DeleteVnfResponse.class);
-        assertEquals(202, deleteVnfResponse.getStatusCode().value());
-        assertNotNull(deleteVnfResponse.getBody().getJobId());
-
-        final ResponseEntity<QueryJobResponse> firstJobQueryResponse =
-                controller.jobQuery(deleteVnfResponse.getBody().getJobId(), "", "so", "1213");
-        assertEquals(OperationEnum.TERMINATE, firstJobQueryResponse.getBody().getOperation());
-        assertEquals(OperationStateEnum.PROCESSING, firstJobQueryResponse.getBody().getOperationState());
-        assertEquals(JAN_1_2019_12_00, firstJobQueryResponse.getBody().getStartTime());
-        assertEquals(JAN_1_2019_1_00, firstJobQueryResponse.getBody().getStateEnteredTime());
-
-        final ResponseEntity<QueryJobResponse> secondJobQueryResponse =
-                controller.jobQuery(deleteVnfResponse.getBody().getJobId(), "", "so", "1213");
-        assertEquals(OperationEnum.TERMINATE, secondJobQueryResponse.getBody().getOperation());
-        assertEquals(OperationStateEnum.PROCESSING, secondJobQueryResponse.getBody().getOperationState());
-        assertEquals(JAN_1_2019_12_00, secondJobQueryResponse.getBody().getStartTime());
-        assertEquals(JAN_1_2019_1_00, secondJobQueryResponse.getBody().getStateEnteredTime());
-    }
-
-    @Test
-    public void deleteVnf_VnfAlreadyTerminated_Returns202AndJobId() throws Exception {
-        final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-        final GenericVnf genericVnf = setUpGenericVnfInMockAai("vnfmType1");
-        addSelfLinkToGenericVnf(genericVnf);
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        setUpVnfmsInMockAai();
-
-        mockRestServer.expect(requestTo("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm/terminate"))
-                .andRespond(withStatus(HttpStatus.CONFLICT).contentType(MediaType.APPLICATION_JSON));
-
-        final InlineResponse201 reponse = new InlineResponse201();
-        reponse.setInstantiationState(InstantiationStateEnum.NOT_INSTANTIATED);
-        mockRestServer.expect(requestTo(new URI("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")))
-                .andRespond(withSuccess(gson.toJson(reponse), MediaType.APPLICATION_JSON));
-
-        mockRestServer.expect(requestTo("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm"))
-                .andRespond(withStatus(HttpStatus.NO_CONTENT).contentType(MediaType.APPLICATION_JSON));
-
-        final RequestEntity<Void> request = RequestEntity
-                .delete(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myTestVnfId"))
-                .accept(MediaType.APPLICATION_JSON).header("X-ONAP-RequestId", "myRequestId")
-                .header("X-ONAP-InvocationID", "myInvocationId").header("Content-Type", "application/json").build();
-        final ResponseEntity<DeleteVnfResponse> deleteVnfResponse =
-                restTemplate.exchange(request, DeleteVnfResponse.class);
-        assertEquals(202, deleteVnfResponse.getStatusCode().value());
-        assertNotNull(deleteVnfResponse.getBody().getJobId());
-
-        final ResponseEntity<QueryJobResponse> jobQueryResponse =
-                controller.jobQuery(deleteVnfResponse.getBody().getJobId(), "", "so", "1213");
-        assertEquals(OperationStateEnum.COMPLETED, jobQueryResponse.getBody().getOperationState());
-    }
-
-    @Test
-    public void deleteVnf_GenericVnfNotFound_Returns404() throws Exception {
-        final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-        final RequestEntity<Void> request = RequestEntity
-                .delete(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myNonExistingVnfId"))
-                .accept(MediaType.APPLICATION_JSON).header("X-ONAP-RequestId", "myRequestId")
-                .header("X-ONAP-InvocationID", "myInvocationId").header("Content-Type", "application/json").build();
-        final ResponseEntity<DeleteVnfResponse> deleteVnfResponse =
-                restTemplate.exchange(request, DeleteVnfResponse.class);
-        assertEquals(404, deleteVnfResponse.getStatusCode().value());
-        assertNull(deleteVnfResponse.getBody().getJobId());
-    }
-
-    @Test
-    public void deleteVnf_NoAssignedVnfm_Returns400() throws Exception {
-        final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-        setUpGenericVnfInMockAai("vnfmType");
-
-        final RequestEntity<Void> request = RequestEntity
-                .delete(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myTestVnfId"))
-                .accept(MediaType.APPLICATION_JSON).header("X-ONAP-RequestId", "myRequestId")
-                .header("X-ONAP-InvocationID", "myInvocationId").header("Content-Type", "application/json").build();
-        final ResponseEntity<DeleteVnfResponse> deleteVnfResponse =
-                restTemplate.exchange(request, DeleteVnfResponse.class);
-        assertEquals(400, deleteVnfResponse.getStatusCode().value());
-        assertNull(deleteVnfResponse.getBody().getJobId());
-    }
-
-    @Test
-    public void deleteVnf_ErrorStatusCodeFromVnfm_Returns500() throws Exception {
-        final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-        final GenericVnf genericVnf = setUpGenericVnfInMockAai("vnfmType1");
-        addSelfLinkToGenericVnf(genericVnf);
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        setUpVnfmsInMockAai();
-
-        mockRestServer.expect(requestTo("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm/terminate"))
-                .andRespond(withStatus(HttpStatus.BAD_REQUEST).contentType(MediaType.APPLICATION_JSON));
-
-        final RequestEntity<Void> request = RequestEntity
-                .delete(new URI("http://localhost:" + port + "/so/vnfm-adapter/v1/vnfs/myTestVnfId"))
-                .accept(MediaType.APPLICATION_JSON).header("X-ONAP-RequestId", "myRequestId")
-                .header("X-ONAP-InvocationID", "myInvocationId").header("Content-Type", "application/json").build();
-        final ResponseEntity<DeleteVnfResponse> deleteVnfResponse =
-                restTemplate.exchange(request, DeleteVnfResponse.class);
-        assertEquals(500, deleteVnfResponse.getStatusCode().value());
-        assertNull(deleteVnfResponse.getBody().getJobId());
-
-    }
-
-    private InlineResponse200 createOperationQueryResponse(
-            final org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationEnum operation,
-            final org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse200.OperationStateEnum operationState) {
-        final InlineResponse200 response = new InlineResponse200();
-        response.setId("9876");
-        response.setOperation(operation);
-        response.setOperationState(operationState);
-        response.setStartTime(JAN_1_2019_12_00);
-        response.setStateEnteredTime(JAN_1_2019_1_00);
-        response.setVnfInstanceId("myVnfInstanceId");
-        return response;
-    }
-
-    private GenericVnf createGenericVnf(final String type) {
-        final GenericVnf genericVnf = new GenericVnf();
-        genericVnf.setVnfId("myTestVnfId");
-        genericVnf.setNfType(type);
-        return genericVnf;
-    }
-
-    private GenericVnf setUpGenericVnfInMockAai(final String type) {
-        final GenericVnf genericVnf = createGenericVnf(type);
-
-        doReturn(Optional.of(genericVnf)).when(aaiResourcesClient).get(eq(GenericVnf.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher("/network/generic-vnfs/generic-vnf/myTestVnfId")));
-        return genericVnf;
-    }
-
-    private void addSelfLinkToGenericVnf(final GenericVnf vnf) {
-        vnf.setSelflink("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm");
-    }
-
-    private void addRelationshipFromGenericVnfToVnfm(final GenericVnf genericVnf, final String vnfmId) {
-        final Relationship relationshipToVnfm = new Relationship();
-        relationshipToVnfm
-                .setRelatedLink("/aai/" + AAIVersion.LATEST + "/external-system/esr-vnfm-list/esr-vnfm/" + vnfmId);
-        relationshipToVnfm.setRelatedTo("esr-vnfm");
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey("esr-vnfm.vnfm-id");
-        relationshipData.setRelationshipValue(vnfmId);
-        relationshipToVnfm.getRelationshipData().add(relationshipData);
-
-        final RelationshipList relationshipList = new RelationshipList();
-        relationshipList.getRelationship().add(relationshipToVnfm);
-        genericVnf.setRelationshipList(relationshipList);
-    }
-
-    private void setUpVnfmsInMockAai() {
-        final EsrSystemInfo esrSystemInfo1 = new EsrSystemInfo();
-        esrSystemInfo1.setServiceUrl("http://vnfm1:8080");
-        esrSystemInfo1.setType("vnfmType1");
-        esrSystemInfo1.setSystemType("VNFM");
-        final EsrSystemInfoList esrSystemInfoList1 = new EsrSystemInfoList();
-        esrSystemInfoList1.getEsrSystemInfo().add(esrSystemInfo1);
-
-        final EsrVnfm esrVnfm1 = new EsrVnfm();
-        esrVnfm1.setVnfmId("vnfm1");
-        esrVnfm1.setEsrSystemInfoList(esrSystemInfoList1);
-        esrVnfm1.setResourceVersion("1234");
-
-        final EsrSystemInfo esrSystemInfo2 = new EsrSystemInfo();
-        esrSystemInfo2.setServiceUrl("http://vnfm2:8080");
-        esrSystemInfo2.setType("vnfmType2");
-        esrSystemInfo2.setSystemType("VNFM");
-        final EsrSystemInfoList esrSystemInfoList2 = new EsrSystemInfoList();
-        esrSystemInfoList2.getEsrSystemInfo().add(esrSystemInfo2);
-
-        final EsrVnfm esrVnfm2 = new EsrVnfm();
-        esrVnfm2.setVnfmId("vnfm2");
-        esrVnfm2.setEsrSystemInfoList(esrSystemInfoList2);
-        esrVnfm2.setResourceVersion("1234");
-
-        final EsrVnfmList esrVnfmList = new EsrVnfmList();
-        esrVnfmList.getEsrVnfm().add(esrVnfm1);
-        esrVnfmList.getEsrVnfm().add(esrVnfm2);
-
-        doReturn(Optional.of(esrVnfm1)).when(aaiResourcesClient).get(eq(EsrVnfm.class), MockitoHamcrest
-                .argThat(new AaiResourceUriMatcher("/external-system/esr-vnfm-list/esr-vnfm/vnfm1?depth=1")));
-
-        doReturn(Optional.of(esrVnfm2)).when(aaiResourcesClient).get(eq(EsrVnfm.class), MockitoHamcrest
-                .argThat(new AaiResourceUriMatcher("/external-system/esr-vnfm-list/esr-vnfm/vnfm2?depth=1")));
-
-        doReturn(Optional.of(esrVnfmList)).when(aaiResourcesClient).get(eq(EsrVnfmList.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher("/external-system/esr-vnfm-list")));
-
-        doReturn(Optional.of(esrSystemInfoList1)).when(aaiResourcesClient).get(eq(EsrSystemInfoList.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher(
-                        "/external-system/esr-vnfm-list/esr-vnfm/vnfm1/esr-system-info-list")));
-        doReturn(Optional.of(esrSystemInfoList2)).when(aaiResourcesClient).get(eq(EsrSystemInfoList.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher(
-                        "/external-system/esr-vnfm-list/esr-vnfm/vnfm2/esr-system-info-list")));
-    }
-
-    private void setUpVimInMockAai() {
-        final EsrSystemInfo esrSystemInfo = new EsrSystemInfo();
-        esrSystemInfo.setServiceUrl("http://myVim:8080");
-        esrSystemInfo.setType("openstack");
-        esrSystemInfo.setSystemType("VIM");
-        esrSystemInfo.setCloudDomain("myDomain");
-        esrSystemInfo.setUserName("myUser");
-        esrSystemInfo.setPassword("myPassword");
-
-        final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-        esrSystemInfoList.getEsrSystemInfo().add(esrSystemInfo);
-
-        doReturn(Optional.of(esrSystemInfoList)).when(aaiResourcesClient).get(eq(EsrSystemInfoList.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher("/cloud-infrastructure/cloud-regions/cloud-region/"
-                        + CLOUD_OWNER + "/" + REGION + "/esr-system-info-list")));
-    }
-
-    private InlineResponse201 createCreateResponse() {
-        final InlineResponse201 createResponse = new InlineResponse201();
-        createResponse.setVnfdId("myTestVnfd");
-        final InlineResponse201Links links = new InlineResponse201Links();
-        final InlineResponse201LinksSelf self = new InlineResponse201LinksSelf();
-        self.setHref("http://vnfm2:8080/vnf_instances/vnfId");
-        links.setSelf(self);
-        createResponse.setLinks(links);
-        createResponse.setId("vnfId");
-        return createResponse;
-    }
-
-
-    private class AaiResourceUriMatcher extends BaseMatcher<AAIBaseResourceUri<?, ?>> {
-
-        final String uriAsString;
-
-        public AaiResourceUriMatcher(final String uriAsString) {
-            this.uriAsString = uriAsString;
-        }
-
-        @Override
-        public boolean matches(final Object item) {
-            if (item instanceof AAIBaseResourceUri<?, ?>) {
-                if (uriAsString.endsWith("...")) {
-                    return ((AAIBaseResourceUri<?, ?>) item).build().toString()
-                            .startsWith(uriAsString.substring(0, uriAsString.indexOf("...")));
-                }
-                return ((AAIBaseResourceUri<?, ?>) item).build().toString().equals(uriAsString);
-            }
-            return false;
-        }
-
-        @Override
-        public void describeTo(final Description description) {}
-
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/HealthCheckTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/HealthCheckTest.java
deleted file mode 100644
index 9fa16b5551..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/HealthCheckTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.junit.Assert.assertEquals;
-import java.net.URI;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class HealthCheckTest {
-
-    @LocalServerPort
-    private int port;
-
-    private final TestRestTemplate restTemplate = new TestRestTemplate("test", "test");
-
-    @Test
-    public void testHealthcheck() throws Exception {
-        final RequestEntity<Void> request =
-                RequestEntity.get(new URI("http://localhost:" + port + "/manage/health")).build();
-        final ResponseEntity<Void> response = restTemplate.exchange(request, Void.class);
-        assertEquals(200, response.getStatusCode().value());
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantControllerTest.java
deleted file mode 100644
index 99b8c71764..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003GrantControllerTest.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.onap.so.client.RestTemplateConfig.CONFIGURABLE_REST_TEMPLATE;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.hamcrest.MockitoHamcrest;
-import org.onap.aai.domain.yang.EsrSystemInfo;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.onap.aaiclient.client.aai.entities.uri.AAIBaseResourceUri;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantRequest;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantRequest.OperationEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantsAddResources;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantsAddResources.TypeEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantsLinks;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.GrantsLinksVnfLcmOpOcc;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.grant.model.InlineResponse201VimConnections;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.client.RestTemplate;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class Sol003GrantControllerTest {
-
-    private static final String CLOUD_OWNER = "myTestCloudOwner";
-    private static final String REGION = "myTestRegion";
-    private static final String TENANT_ID = "myTestTenantId";
-    private static final String SEPARATOR = "_";
-    private static final String vimConnectionId = CLOUD_OWNER + SEPARATOR + REGION;
-
-    @LocalServerPort
-    private int port;
-    @Autowired
-    @Qualifier(CONFIGURABLE_REST_TEMPLATE)
-    private RestTemplate testRestTemplate;
-
-    @MockBean
-    private AAIResourcesClient aaiResourcesClient;
-
-    @Autowired
-    private Sol003GrantController controller;
-
-    @Before
-    public void setUp() throws Exception {
-        setUpVimInMockAai();
-    }
-
-    @Test
-    public void grantRequest_ValidRequestInstantiate_GrantApproved() {
-        final GrantRequest grantRequest = createGrantRequest("INSTANTIATE");
-        setUpGenericVnfWithVnfmRelationshipInMockAai("vnfmType", "vnfm1");
-        final ResponseEntity<InlineResponse201> response = controller.grantsPost(grantRequest);
-        assertEquals(HttpStatus.CREATED, response.getStatusCode());
-        assertEquals(1, response.getBody().getAddResources().size());
-        assertNull(response.getBody().getRemoveResources());
-
-        assertEquals(vimConnectionId, response.getBody().getAddResources().get(0).getVimConnectionId());
-        assertEquals("myTestVnfIdOnVnfm", response.getBody().getVnfInstanceId());
-        assertEquals("123456", response.getBody().getVnfLcmOpOccId());
-
-        final InlineResponse201VimConnections vimConnections = response.getBody().getVimConnections().get(0);
-        assertEquals(vimConnectionId, vimConnections.getVimId());
-        assertEquals("OPENSTACK", vimConnections.getVimType());
-        assertNotNull(vimConnections.getAccessInfo());
-        assertNotNull(vimConnections.getInterfaceInfo());
-        assertEquals("INSTANTIATE", grantRequest.getOperation().toString());
-    }
-
-    @Test
-    public void getGrant_notSupported_returns501() {
-        final ResponseEntity<InlineResponse201> response2 = controller.grantsGrantIdGet("myTestGrantId");
-        assertEquals(HttpStatus.NOT_IMPLEMENTED, response2.getStatusCode());
-    }
-
-    @Test
-    public void grantRequest_ValidRequestTerminate_GrantApproved() {
-        final GrantRequest grantRequest = createGrantRequest("TERMINATE");
-        setUpGenericVnfWithVnfmRelationshipInMockAai("vnfmType", "vnfm1");
-        final ResponseEntity<InlineResponse201> response = controller.grantsPost(grantRequest);
-
-        assertEquals(HttpStatus.CREATED, response.getStatusCode());
-        assertNull(response.getBody().getAddResources());
-        assertEquals(1, response.getBody().getRemoveResources().size());
-        assertEquals(vimConnectionId, response.getBody().getRemoveResources().get(0).getVimConnectionId());
-        assertEquals("myTestVnfIdOnVnfm", response.getBody().getVnfInstanceId());
-        assertEquals("123456", response.getBody().getVnfLcmOpOccId());
-
-        final InlineResponse201VimConnections vimConnections = response.getBody().getVimConnections().get(0);
-        assertEquals(vimConnectionId, vimConnections.getVimId());
-        assertEquals("OPENSTACK", vimConnections.getVimType());
-        assertNotNull(vimConnections.getAccessInfo());
-        assertNotNull(vimConnections.getInterfaceInfo());
-        assertEquals("TERMINATE", grantRequest.getOperation().toString());
-
-    }
-
-    private GrantRequest createGrantRequest(final String operation) {
-        final GrantRequest grantRequest = new GrantRequest();
-        grantRequest.setVnfInstanceId("myTestVnfIdOnVnfm");
-        grantRequest.setVnfLcmOpOccId("123456");
-        grantRequest.links(new GrantsLinks()
-                .vnfInstance(new GrantsLinksVnfLcmOpOcc().href("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")));
-        if (operation == "INSTANTIATE") {
-            grantRequest.setOperation(OperationEnum.INSTANTIATE);
-            final GrantsAddResources resource = new GrantsAddResources();
-            resource.setId("123");
-            resource.setType(TypeEnum.COMPUTE);
-            grantRequest.addAddResourcesItem(resource);
-        } else if (operation == "TERMINATE") {
-            grantRequest.setOperation(OperationEnum.TERMINATE);
-            final GrantsAddResources resource = new GrantsAddResources();
-            resource.setId("123");
-            resource.setType(TypeEnum.COMPUTE);
-            grantRequest.addRemoveResourcesItem(resource);
-        }
-
-        return grantRequest;
-    }
-
-    private void setUpVimInMockAai() {
-        final EsrSystemInfo esrSystemInfo = new EsrSystemInfo();
-        esrSystemInfo.setServiceUrl("http://myVim:8080");
-        esrSystemInfo.setType("OPENSTACK");
-        esrSystemInfo.setSystemType("VIM");
-        esrSystemInfo.setCloudDomain("myDomain");
-        esrSystemInfo.setUserName("myUser");
-        esrSystemInfo.setPassword("myPassword");
-
-        final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-        esrSystemInfoList.getEsrSystemInfo().add(esrSystemInfo);
-
-        doReturn(Optional.of(esrSystemInfoList)).when(aaiResourcesClient).get(eq(EsrSystemInfoList.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher("/cloud-infrastructure/cloud-regions/cloud-region/"
-                        + CLOUD_OWNER + "/" + REGION + "/esr-system-info-list")));
-    }
-
-    private GenericVnf createGenericVnf(final String type) {
-        final GenericVnf genericVnf = new GenericVnf();
-        genericVnf.setVnfId("myTestVnfId");
-        genericVnf.setNfType(type);
-        return genericVnf;
-    }
-
-    private void setUpGenericVnfWithVnfmRelationshipInMockAai(final String type, final String vnfmId) {
-        final GenericVnf genericVnf = createGenericVnf(type);
-
-        final Relationship relationshipToVnfm = new Relationship();
-        relationshipToVnfm.setRelatedTo("tenant");
-        final RelationshipData relationshipData1 = new RelationshipData();
-        final RelationshipData relationshipData2 = new RelationshipData();
-        final RelationshipData relationshipData3 = new RelationshipData();
-
-        relationshipData1.setRelationshipKey("cloud-region.cloud-owner");
-        relationshipData1.setRelationshipValue(CLOUD_OWNER);
-        relationshipData2.setRelationshipKey("cloud-region.cloud-region-id");
-        relationshipData2.setRelationshipValue(REGION);
-        relationshipData3.setRelationshipKey("tenant.tenant-id");
-        relationshipData3.setRelationshipValue(TENANT_ID);
-
-        relationshipToVnfm.getRelationshipData().add(relationshipData1);
-        relationshipToVnfm.getRelationshipData().add(relationshipData2);
-        relationshipToVnfm.getRelationshipData().add(relationshipData3);
-
-        final RelationshipList relationshipList = new RelationshipList();
-        relationshipList.getRelationship().add(relationshipToVnfm);
-        genericVnf.setRelationshipList(relationshipList);
-
-        doReturn(Optional.of(genericVnf)).when(aaiResourcesClient).get(eq(GenericVnf.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher("/network/generic-vnfs/generic-vnf/myTestVnfId")));
-
-        final List<GenericVnf> listOfGenericVnfs = new ArrayList<>();
-        listOfGenericVnfs.add(genericVnf);
-        final GenericVnfs genericVnfs = new GenericVnfs();
-        genericVnfs.getGenericVnf().addAll(listOfGenericVnfs);
-        doReturn(Optional.of(genericVnfs)).when(aaiResourcesClient).get(eq(GenericVnfs.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher(
-                        "/network/generic-vnfs?selflink=http%3A%2F%2Fvnfm%3A8080%2Fvnfs%2FmyTestVnfIdOnVnfm")));
-    }
-
-    private class AaiResourceUriMatcher extends BaseMatcher<AAIBaseResourceUri<?, ?>> {
-
-        final String uriAsString;
-
-        public AaiResourceUriMatcher(final String uriAsString) {
-            this.uriAsString = uriAsString;
-        }
-
-        @Override
-        public boolean matches(final Object item) {
-            if (item instanceof AAIBaseResourceUri) {
-                if (uriAsString.endsWith("...")) {
-                    return ((AAIBaseResourceUri<?, ?>) item).build().toString()
-                            .startsWith(uriAsString.substring(0, uriAsString.indexOf("...")));
-                }
-                return ((AAIBaseResourceUri<?, ?>) item).build().toString().equals(uriAsString);
-            }
-            return false;
-        }
-
-        @Override
-        public void describeTo(final Description description) {}
-
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnControllerTest.java
deleted file mode 100644
index 0d5bcd2573..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/Sol003LcnControllerTest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.VnfmRestTemplateConfiguration;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import javax.inject.Inject;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.hamcrest.MockitoHamcrest;
-import org.onap.aai.domain.yang.EsrSystemInfoList;
-import org.onap.aai.domain.yang.EsrVnfm;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.GenericVnfs;
-import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
-import org.onap.aai.domain.yang.RelationshipList;
-import org.onap.aai.domain.yang.Vserver;
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.onap.aaiclient.client.aai.entities.uri.AAIBaseResourceUri;
-import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.AaiHelper;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.aai.OamIpAddressSource.OamIpAddressType;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vim.model.AccessInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201Links;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201LinksSelf;
-import org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model.InlineResponse201VimConnectionInfo;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs.ChangeTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationComputeResource;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationLinks;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.LcnVnfLcmOperationOccurrenceNotificationLinksVnfInstance;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfIdentifierCreationNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification.OperationEnum;
-import org.onap.so.adapters.etsisol003adapter.lcm.lcn.model.VnfLcmOperationOccurrenceNotification.OperationStateEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class Sol003LcnControllerTest {
-
-    private static final String CLOUD_OWNER = "myTestCloudOwner";
-    private static final String REGION = "myTestRegion";
-    private static final String TENANT_ID = "myTestTenantId";
-
-    @LocalServerPort
-    private int port;
-    @Autowired
-    @Qualifier(VnfmRestTemplateConfiguration.SOL003_LCM_REST_TEMPLATE)
-    private RestTemplate testRestTemplate;
-    private MockRestServiceServer mockRestServer;
-
-    @MockBean
-    private AAIResourcesClient aaiResourcesClient;
-
-    @Autowired
-    private Sol003LcnContoller controller;
-    private final Gson gson = new Gson();
-
-    @Inject
-    private AaiHelper aaiHelper;
-
-    @Before
-    public void setUp() throws Exception {
-        mockRestServer = MockRestServiceServer.bindTo(testRestTemplate).build();
-    }
-
-    @Test
-    public void lcnNotification_IdentifierCreated_Returns204() throws URISyntaxException, InterruptedException {
-        final VnfIdentifierCreationNotification vnfIdentifierCreationNotification =
-                new VnfIdentifierCreationNotification();
-        final ResponseEntity<Void> response =
-                controller.lcnVnfIdentifierCreationNotificationPost(vnfIdentifierCreationNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void lcnNotification_IdentifierDeleted_Returns204() throws URISyntaxException, InterruptedException {
-        final VnfIdentifierCreationNotification vnfIdentifierCreationNotification =
-                new VnfIdentifierCreationNotification();
-        final ResponseEntity<Void> response =
-                controller.lcnVnfIdentifierCreationNotificationPost(vnfIdentifierCreationNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void lcnNotification_InstantiateStartingOrProcessing_NoAction()
-            throws URISyntaxException, InterruptedException {
-        final VnfLcmOperationOccurrenceNotification startingNotification = new VnfLcmOperationOccurrenceNotification();
-        startingNotification.setOperation(OperationEnum.INSTANTIATE);
-        startingNotification.setOperationState(OperationStateEnum.STARTING);
-
-        ResponseEntity<Void> response = controller.lcnVnfLcmOperationOccurrenceNotificationPost(startingNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-
-        verifyZeroInteractions(aaiResourcesClient);
-
-        final VnfLcmOperationOccurrenceNotification processingNotification =
-                new VnfLcmOperationOccurrenceNotification();
-        processingNotification.setOperation(OperationEnum.INSTANTIATE);
-        processingNotification.setOperationState(OperationStateEnum.STARTING);
-
-        response = controller.lcnVnfLcmOperationOccurrenceNotificationPost(processingNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-
-        verifyZeroInteractions(aaiResourcesClient);
-    }
-
-    @Test
-    public void lcnNotification_InstantiateCompleted_AaiUpdated() throws URISyntaxException, InterruptedException {
-        final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification =
-                createNotification(OperationEnum.INSTANTIATE);
-        addVnfcsToNotification(vnfLcmOperationOccurrenceNotification, ChangeTypeEnum.ADDED);
-        final InlineResponse201 vnfInstance = createVnfInstance();
-
-        mockRestServer.expect(requestTo(new URI("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")))
-                .andRespond(withSuccess(gson.toJson(vnfInstance), MediaType.APPLICATION_JSON));
-
-        final GenericVnf genericVnf = createGenericVnf("vnfmType1");
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        final List<GenericVnf> listOfGenericVnfs = new ArrayList<>();
-        listOfGenericVnfs.add(genericVnf);
-        final GenericVnfs genericVnfs = new GenericVnfs();
-        genericVnfs.getGenericVnf().addAll(listOfGenericVnfs);
-        doReturn(Optional.of(genericVnfs)).when(aaiResourcesClient).get(eq(GenericVnfs.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher(
-                        "/network/generic-vnfs?selflink=http%3A%2F%2Fvnfm%3A8080%2Fvnfs%2FmyTestVnfIdOnVnfm")));
-        final EsrVnfm vnfm = new EsrVnfm();
-        vnfm.setVnfmId("vnfm1");
-        final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-        vnfm.setEsrSystemInfoList(esrSystemInfoList);
-        doReturn(Optional.of(vnfm)).when(aaiResourcesClient).get(eq(EsrVnfm.class), MockitoHamcrest
-                .argThat(new AaiResourceUriMatcher("/external-system/esr-vnfm-list/esr-vnfm/vnfm1?depth=1")));
-
-        final ResponseEntity<Void> response =
-                controller.lcnVnfLcmOperationOccurrenceNotificationPost(vnfLcmOperationOccurrenceNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-
-        final ArgumentCaptor<Object> bodyArgument1 = ArgumentCaptor.forClass(Object.class);
-        final ArgumentCaptor<AAIResourceUri> uriArgument1 = ArgumentCaptor.forClass(AAIResourceUri.class);
-
-        verify(aaiResourcesClient, timeout(1000)).update(uriArgument1.capture(), bodyArgument1.capture());
-
-        assertEquals("/network/generic-vnfs/generic-vnf/myTestVnfId",
-                uriArgument1.getAllValues().get(0).build().toString());
-        final GenericVnf updatedGenericVnf = (GenericVnf) bodyArgument1.getAllValues().get(0);
-        assertEquals("10.10.10.10", updatedGenericVnf.getIpv4OamAddress());
-        assertEquals("Created", updatedGenericVnf.getOrchestrationStatus());
-
-        final ArgumentCaptor<Object> bodyArgument2 = ArgumentCaptor.forClass(Object.class);
-        final ArgumentCaptor<AAIResourceUri> uriArgument2 = ArgumentCaptor.forClass(AAIResourceUri.class);
-        verify(aaiResourcesClient, timeout(1000)).create(uriArgument2.capture(), bodyArgument2.capture());
-
-        assertEquals(
-                "/cloud-infrastructure/cloud-regions/cloud-region/" + CLOUD_OWNER + "/" + REGION + "/tenants/tenant/"
-                        + TENANT_ID + "/vservers/vserver/myVnfc1",
-                uriArgument2.getAllValues().get(0).build().toString());
-
-        final Vserver vserver = (Vserver) bodyArgument2.getAllValues().get(0);
-        assertEquals("myVnfc1", vserver.getVserverId());
-
-        final ArgumentCaptor<AAIResourceUri> uriArgument1Connect = ArgumentCaptor.forClass(AAIResourceUri.class);
-        final ArgumentCaptor<AAIResourceUri> uriArgument2Connect = ArgumentCaptor.forClass(AAIResourceUri.class);
-        verify(aaiResourcesClient, timeout(1000)).connect(uriArgument1Connect.capture(), uriArgument2Connect.capture());
-        assertEquals(
-                "/cloud-infrastructure/cloud-regions/cloud-region/" + CLOUD_OWNER + "/" + REGION + "/tenants/tenant/"
-                        + TENANT_ID + "/vservers/vserver/myVnfc1",
-                uriArgument1Connect.getAllValues().get(0).build().toString());
-        assertEquals("/network/generic-vnfs/generic-vnf/myTestVnfId",
-                uriArgument2Connect.getAllValues().get(0).build().toString());
-    }
-
-    @Test
-    public void lcnNotification_TerminateCompleted_AaiUpdated() throws URISyntaxException, InterruptedException {
-        final VnfLcmOperationOccurrenceNotification vnfLcmOperationOccurrenceNotification =
-                createNotification(OperationEnum.TERMINATE);
-        addVnfcsToNotification(vnfLcmOperationOccurrenceNotification, ChangeTypeEnum.REMOVED);
-
-        final InlineResponse201 vnfInstance = createVnfInstance();
-
-        mockRestServer.expect(requestTo(new URI("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")))
-                .andRespond(withSuccess(gson.toJson(vnfInstance), MediaType.APPLICATION_JSON));
-
-        mockRestServer.expect(requestTo(new URI("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm")))
-                .andRespond(withStatus(HttpStatus.NO_CONTENT).contentType(MediaType.APPLICATION_JSON));
-
-        final GenericVnf genericVnf = createGenericVnf("vnfmType1");
-        addRelationshipFromGenericVnfToVnfm(genericVnf, "vnfm1");
-        genericVnf.setSelflink("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm");
-        final List<GenericVnf> listOfGenericVnfs = new ArrayList<>();
-        listOfGenericVnfs.add(genericVnf);
-        final GenericVnfs genericVnfs = new GenericVnfs();
-        genericVnfs.getGenericVnf().addAll(listOfGenericVnfs);
-        addRelationshipFromGenericVnfToVserver(genericVnf, "myVnfc1");
-
-        doReturn(Optional.of(genericVnfs)).when(aaiResourcesClient).get(eq(GenericVnfs.class),
-                MockitoHamcrest.argThat(new AaiResourceUriMatcher(
-                        "/network/generic-vnfs?selflink=http%3A%2F%2Fvnfm%3A8080%2Fvnfs%2FmyTestVnfIdOnVnfm")));
-        final EsrVnfm vnfm = new EsrVnfm();
-        vnfm.setVnfmId("vnfm1");
-        final EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
-        vnfm.setEsrSystemInfoList(esrSystemInfoList);
-        doReturn(Optional.of(vnfm)).when(aaiResourcesClient).get(eq(EsrVnfm.class), MockitoHamcrest
-                .argThat(new AaiResourceUriMatcher("/external-system/esr-vnfm-list/esr-vnfm/vnfm1?depth=1")));
-
-        final ResponseEntity<Void> response =
-                controller.lcnVnfLcmOperationOccurrenceNotificationPost(vnfLcmOperationOccurrenceNotification);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-
-        final ArgumentCaptor<GenericVnf> genericVnfArgument = ArgumentCaptor.forClass(GenericVnf.class);
-        final ArgumentCaptor<AAIResourceUri> updateUriArgument = ArgumentCaptor.forClass(AAIResourceUri.class);
-        verify(aaiResourcesClient, timeout(10000000)).update(updateUriArgument.capture(), genericVnfArgument.capture());
-        assertEquals("/network/generic-vnfs/generic-vnf/myTestVnfId", updateUriArgument.getValue().build().toString());
-        assertEquals("Assigned", genericVnfArgument.getValue().getOrchestrationStatus());
-
-        final ArgumentCaptor<AAIResourceUri> deleteUriArgument = ArgumentCaptor.forClass(AAIResourceUri.class);
-
-        verify(aaiResourcesClient, timeout(10000000)).delete(deleteUriArgument.capture());
-
-        assertEquals(
-                "/cloud-infrastructure/cloud-regions/cloud-region/" + CLOUD_OWNER + "/" + REGION + "/tenants/tenant/"
-                        + TENANT_ID + "/vservers/vserver/myVnfc1",
-                deleteUriArgument.getAllValues().get(0).build().toString());
-    }
-
-    private VnfLcmOperationOccurrenceNotification createNotification(final OperationEnum operation) {
-        final VnfLcmOperationOccurrenceNotification notification = new VnfLcmOperationOccurrenceNotification();
-        notification.setOperation(operation);
-        notification.setOperationState(OperationStateEnum.COMPLETED);
-
-        final LcnVnfLcmOperationOccurrenceNotificationLinksVnfInstance linkToVnfInstance =
-                new LcnVnfLcmOperationOccurrenceNotificationLinksVnfInstance()
-                        .href("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm");
-        final LcnVnfLcmOperationOccurrenceNotificationLinks operationLinks =
-                new LcnVnfLcmOperationOccurrenceNotificationLinks().vnfInstance(linkToVnfInstance);
-        notification.setLinks(operationLinks);
-
-        return notification;
-    }
-
-    private void addVnfcsToNotification(final VnfLcmOperationOccurrenceNotification notification,
-            final ChangeTypeEnum changeType) {
-        final List<LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs> affectedVnfcs = new ArrayList<>();;
-        final LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs vnfc =
-                new LcnVnfLcmOperationOccurrenceNotificationAffectedVnfcs();
-        vnfc.changeType(changeType);
-        final LcnVnfLcmOperationOccurrenceNotificationComputeResource computeResource =
-                new LcnVnfLcmOperationOccurrenceNotificationComputeResource();
-        computeResource.setResourceId("myVnfc1");
-        computeResource.setVimConnectionId(CLOUD_OWNER + "_" + REGION);
-        vnfc.setComputeResource(computeResource);
-        affectedVnfcs.add(vnfc);
-        notification.setAffectedVnfcs(affectedVnfcs);
-    }
-
-    private InlineResponse201 createVnfInstance() {
-        final InlineResponse201 vnfInstance = new InlineResponse201();
-        vnfInstance.setId("myTestVnfIdOnVnfm");
-        final InlineResponse201LinksSelf selfLink = new InlineResponse201LinksSelf();
-        selfLink.setHref("http://vnfm:8080/vnfs/myTestVnfIdOnVnfm");
-        final InlineResponse201Links VnfInstancelinks = new InlineResponse201Links();
-        VnfInstancelinks.setSelf(selfLink);
-        vnfInstance.setLinks(VnfInstancelinks);
-
-        final Map<String, String> vnfConfigurableProperties = new HashMap<>();
-        vnfConfigurableProperties.put("vnfIpAddress", "10.10.10.10");
-        vnfInstance.setVnfConfigurableProperties(vnfConfigurableProperties);
-
-        final List<InlineResponse201VimConnectionInfo> vimConnectionInfo = new ArrayList<>();;
-        final InlineResponse201VimConnectionInfo vimConnection = new InlineResponse201VimConnectionInfo();
-        vimConnection.setVimId(CLOUD_OWNER + "_" + REGION);
-        vimConnection.setId(CLOUD_OWNER + "_" + REGION);
-        final AccessInfo accessInfo = new AccessInfo();
-        accessInfo.setProjectId(TENANT_ID);
-        vimConnection.setAccessInfo(accessInfo);
-        vimConnectionInfo.add(vimConnection);
-        vnfInstance.setVimConnectionInfo(vimConnectionInfo);
-
-        final OamIpAddressSource oamIpAddressSource =
-                new OamIpAddressSource(OamIpAddressType.CONFIGURABLE_PROPERTY, "vnfIpAddress");
-        aaiHelper.setOamIpAddressSource("myTestVnfIdOnVnfm", oamIpAddressSource);
-        return vnfInstance;
-    }
-
-    private GenericVnf createGenericVnf(final String type) {
-        final GenericVnf genericVnf = new GenericVnf();
-        genericVnf.setVnfId("myTestVnfId");
-        genericVnf.setNfType(type);
-        return genericVnf;
-    }
-
-    private void addRelationshipFromGenericVnfToVnfm(final GenericVnf genericVnf, final String vnfmId) {
-        final Relationship relationshipToVnfm = new Relationship();
-        relationshipToVnfm.setRelatedLink("/aai/v15/external-system/esr-vnfm-list/esr-vnfm/" + vnfmId);
-        relationshipToVnfm.setRelatedTo("esr-vnfm");
-        final RelationshipData relationshipData = new RelationshipData();
-        relationshipData.setRelationshipKey("esr-vnfm.vnfm-id");
-        relationshipData.setRelationshipValue(vnfmId);
-        relationshipToVnfm.getRelationshipData().add(relationshipData);
-
-        if (genericVnf.getRelationshipList() == null) {
-            final RelationshipList relationshipList = new RelationshipList();
-            genericVnf.setRelationshipList(relationshipList);
-        }
-        genericVnf.getRelationshipList().getRelationship().add(relationshipToVnfm);
-    }
-
-    private void addRelationshipFromGenericVnfToVserver(final GenericVnf genericVnf, final String vserverId) {
-        final Relationship relationshipToVserver = new Relationship();
-        relationshipToVserver.setRelatedTo("vserver");
-        final RelationshipData relationshipData1 = new RelationshipData();
-        relationshipData1.setRelationshipKey("vserver.vserver-id");
-        relationshipData1.setRelationshipValue(vserverId);
-        relationshipToVserver.getRelationshipData().add(relationshipData1);
-        final RelationshipData relationshipData2 = new RelationshipData();
-        relationshipData2.setRelationshipKey("cloud-region.cloud-owner");
-        relationshipData2.setRelationshipValue(CLOUD_OWNER);
-        relationshipToVserver.getRelationshipData().add(relationshipData2);
-        final RelationshipData relationshipData3 = new RelationshipData();
-        relationshipData3.setRelationshipKey("cloud-region.cloud-region-id");
-        relationshipData3.setRelationshipValue(REGION);
-        relationshipToVserver.getRelationshipData().add(relationshipData3);
-        final RelationshipData relationshipData4 = new RelationshipData();
-        relationshipData4.setRelationshipKey("tenant.tenant-id");
-        relationshipData4.setRelationshipValue(TENANT_ID);
-        relationshipToVserver.getRelationshipData().add(relationshipData4);
-
-        if (genericVnf.getRelationshipList() == null) {
-            final RelationshipList relationshipList = new RelationshipList();
-            genericVnf.setRelationshipList(relationshipList);
-        }
-        genericVnf.getRelationshipList().getRelationship().add(relationshipToVserver);
-    }
-
-    private class AaiResourceUriMatcher extends BaseMatcher<AAIBaseResourceUri<?, ?>> {
-
-        final String uriAsString;
-
-        public AaiResourceUriMatcher(final String uriAsString) {
-            this.uriAsString = uriAsString;
-        }
-
-        @Override
-        public boolean matches(final Object item) {
-            if (item instanceof AAIBaseResourceUri<?, ?>) {
-                if (uriAsString.endsWith("...")) {
-                    return ((AAIBaseResourceUri<?, ?>) item).build().toString()
-                            .startsWith(uriAsString.substring(0, uriAsString.indexOf("...")));
-                }
-                return ((AAIBaseResourceUri<?, ?>) item).build().toString().equals(uriAsString);
-            }
-            return false;
-        }
-
-        @Override
-        public void describeTo(final Description description) {}
-
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/TestApplication.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/TestApplication.java
deleted file mode 100755
index b59bc025e8..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/lcm/rest/TestApplication.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.lcm.rest;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.cache.annotation.EnableCaching;
-
-@EnableCaching
-@SpringBootApplication(scanBasePackages = {"org.onap.so"})
-@EnableAutoConfiguration(exclude = {JacksonAutoConfiguration.class})
-public class TestApplication {
-
-    public static void main(final String[] args) {
-        new SpringApplication(TestApplication.class).run(args);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/resources/application.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/resources/application.yaml
deleted file mode 100644
index cdb6662191..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/test/resources/application.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 2019 Nordix Foundation
-#
-# 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.
-spring:
-  security:
-    usercredentials:
-      - username: test
-        password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu'
-        role: BPEL-Client
-      - username: vnfm
-        password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-        role: BPEL-Client
-  main:
-    allow-bean-definition-overriding: true
-
-mso:
-  key: 07a7159d3bf51a0e53be7a8f89699be7
-
-aai:
-  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
-  endpoint: https://aai.onap:8443
-  version: v15
-
-sdc:
-  username: sdcUser
-  password: sdcPassword
-  key: adadadadad
-  endpoint: http://sdc.onap/1234A
-
-
-vnfmadapter:
-  endpoint: https://so-vnfm-adapter.onap:30406
-
-  
-#Actuator
-management:
-  endpoints:
-    web:
-      base-path: /manage
-      exposure:
-        include: "*"
-  metrics:
-    se-global-registry: false
-    export:
-      prometheus:
-        enabled: true # Whether exporting of metrics to Prometheus is enabled.
-        step: 1m # Step size (i.e. reporting frequency) to use.
-
-etsi-catalog-manager:
-   vnfpkgm:
-      endpoint: http://msb-iag.onap:80/api/vnfpkgm/v1
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/pom.xml
deleted file mode 100644
index 63a46d591e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/pom.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-lcm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-lcm-api</artifactId>
-  <name>ETSI SOL003 Life Cycle Management Adapter API</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>${version-swagger-codegen}</version>
-        <executions>
-          <execution>
-            <id>vnfmadapter</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/etsisol003adapter.yaml</inputSpec>
-              <language>java</language>
-              <library>retrofit2</library>
-              <output>${project.build.directory}/generated-sources/etsisol003adapter</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.lcm.v1.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.lcm.v1.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <jackson>true</jackson>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sol003-vnf-lcn-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/sol003-vnf-lcn</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.lcm.lcn.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.lcm.lcn.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sol003-vnf-grant-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/sol003-vnf-grant</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.lcm.grant.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.lcm.grant.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <generateSupportingFiles>false</generateSupportingFiles>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.basedir}/target/generated-sources/vnfmadapter/src/gen/java/main</source>
-                <source>${project.basedir}/target/generated-sources/sol003-vnf-lcn/src/gen/java/main</source>
-                <source>${project.basedir}/target/generated-sources/sol003-vnf-grant/src/gen/java/main</source>
-                <source>${project.basedir}/target/generated-sources/etsisol003adapter/src/gen/java/main</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                    <versionRange>[2.2.0,)</versionRange>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-scalars</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${oltu-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.gsonfire</groupId>
-      <artifactId>gson-fire</artifactId>
-      <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>adapter-rxjava2</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okio</groupId>
-      <artifactId>okio</artifactId>
-      <version>${okio-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-  </dependencies>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json
deleted file mode 100644
index d3b6ebaa7e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleManagementNotification-API.json
+++ /dev/null
@@ -1,1897 +0,0 @@
-{
-  "swagger" : "2.0",
-  "info" : {
-    "description" : "SOL003 - VNF Lifecycle Management Notification interface\n\nIMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.\n\nIn clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based filtering mechanism is defined. This mechanism is currently not included in the corresponding OpenAPI design for this GS version. Changes to the attribute-based filtering mechanism are being considered in v2.5.1 of this GS for inclusion in the corresponding future ETSI NFV OpenAPI design.\nPlease report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=\n",
-    "version" : "1.1.1",
-    "title" : "SOL003 - VNF Lifecycle Management Notification interface",
-    "license" : {
-      "name" : "ETSI Forge copyright notice",
-      "url" : "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
-    }
-  },
-  "basePath" : "/so/vnfm-adapter/v1/",
-  "schemes" : [ "https" ],
-  "consumes" : [ "application/json" ],
-  "produces" : [ "application/json" ],
-  "paths" : {
-    "/lcn/VnfLcmOperationOccurrenceNotification" : {
-      "post" : {
-        "description" : "Notify\n\nThe POST method delivers a notification from the server to the client.\n",
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "VnfLcmOperationOccurrenceNotification",
-          "description" : "A notification about on-boarding of a VNF package.",
-          "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/VnfLcmOperationOccurrenceNotification"
-          }
-        }, {
-          "name" : "Authorization",
-          "in" : "header",
-          "description" : "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "Content-Type",
-          "in" : "header",
-          "description" : "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-          "required" : true,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "204" : {
-            "description" : "No Content\nThe notification was delivered successfully.\n",
-            "headers" : {
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            }
-          },
-          "400" : {
-            "description" : "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "401" : {
-            "description" : "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "403" : {
-            "description" : "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "404" : {
-            "description" : "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "405" : {
-            "description" : "Method Not Allowed\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "406" : {
-            "description" : "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.        \n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "500" : {
-            "description" : "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "503" : {
-            "description" : "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          }
-        }
-      }
-    },
-    "/lcn/VnfIdentifierCreationNotification" : {
-      "post" : {
-        "description" : "Notify\n\nThe POST method delivers a notification from the server to the client.\n",
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "VnfIdentifierCreationNotification",
-          "description" : "A notification about the creation of a VNF identifier and the related VNF instance resource.\n",
-          "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/VnfIdentifierCreationNotification"
-          }
-        }, {
-          "name" : "Authorization",
-          "in" : "header",
-          "description" : "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "Content-Type",
-          "in" : "header",
-          "description" : "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-          "required" : true,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "204" : {
-            "description" : "No Content\nThe notification was delivered successfully.\n",
-            "headers" : {
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            }
-          },
-          "400" : {
-            "description" : "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "401" : {
-            "description" : "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "403" : {
-            "description" : "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "404" : {
-            "description" : "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "405" : {
-            "description" : "Method Not Allowed\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "406" : {
-            "description" : "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.        \n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "500" : {
-            "description" : "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "503" : {
-            "description" : "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          }
-        }
-      }
-    },
-    "/lcn/VnfIdentifierDeletionNotification" : {
-      "post" : {
-        "description" : "Notify\n\nThe POST method delivers a notification from the server to the client.\n",
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "VnfIdentifierDeletionNotification",
-          "description" : "A notification about the deletion of a VNF identifier and the related VNF instance resource.\n",
-          "required" : true,
-          "schema" : {
-            "$ref" : "#/definitions/VnfIdentifierDeletionNotification"
-          }
-        }, {
-          "name" : "Authorization",
-          "in" : "header",
-          "description" : "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "Content-Type",
-          "in" : "header",
-          "description" : "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-          "required" : true,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "204" : {
-            "description" : "No Content\nThe notification was delivered successfully.\n",
-            "headers" : {
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            }
-          },
-          "400" : {
-            "description" : "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "401" : {
-            "description" : "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              },
-              "WWW-Authenticate" : {
-                "type" : "string",
-                "description" : "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n"
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "403" : {
-            "description" : "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "404" : {
-            "description" : "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "405" : {
-            "description" : "Method Not Allowed\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "406" : {
-            "description" : "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.        \n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "500" : {
-            "description" : "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          },
-          "503" : {
-            "description" : "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers" : {
-              "Content-Type" : {
-                "type" : "string",
-                "description" : "The MIME type of the body of the response."
-              }
-            },
-            "schema" : {
-              "type" : "object",
-              "required" : [ "detail", "status" ],
-              "properties" : {
-                "type" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-                },
-                "title" : {
-                  "type" : "string",
-                  "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-                },
-                "status" : {
-                  "type" : "integer",
-                  "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-                },
-                "detail" : {
-                  "type" : "string",
-                  "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-                },
-                "instance" : {
-                  "type" : "string",
-                  "format" : "URI",
-                  "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-                }
-              },
-              "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n"
-            }
-          }
-        }
-      }
-    }
-  },
-  "definitions" : {
-    "lcnVnfLcmOperationOccurrenceNotification_changedInfo_vimConnectionInfo" : {
-      "required" : [ "id", "vimType" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "vimId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "vimType" : {
-          "type" : "string",
-          "description" : "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n"
-        },
-        "interfaceInfo" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "accessInfo" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "extra" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        }
-      },
-      "description" : "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-      "example" : {
-        "vimType" : "vimType",
-        "vimId" : "vimId",
-        "extra" : "{}",
-        "interfaceInfo" : "{}",
-        "id" : "id",
-        "accessInfo" : "{}"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_computeResource" : {
-      "required" : [ "resourceId", "vimConnectionId" ],
-      "properties" : {
-        "vimConnectionId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "resourceProviderId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "resourceId" : {
-          "type" : "string",
-          "description" : "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n"
-        },
-        "vimLevelResourceType" : {
-          "type" : "string",
-          "description" : "Type of the resource in the scope of the VIM or the resource provider.\n"
-        }
-      },
-      "description" : "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-      "example" : {
-        "resourceId" : "resourceId",
-        "vimConnectionId" : "vimConnectionId",
-        "vimLevelResourceType" : "vimLevelResourceType",
-        "resourceProviderId" : "resourceProviderId"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_affectedVnfcs" : {
-      "required" : [ "changeType", "computeResource", "id", "vduId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-        },
-        "vduId" : {
-          "type" : "string",
-          "description" : "An identifier that is unique within a VNF descriptor.\n"
-        },
-        "changeType" : {
-          "type" : "string",
-          "description" : "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVnfc structure exists as long as the temporary resource exists.\n",
-          "enum" : [ "ADDED", "REMOVED", "MODIFIED", "TEMPORARY" ]
-        },
-        "computeResource" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_computeResource"
-        },
-        "metadata" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "affectedVnfcCpIds" : {
-          "type" : "array",
-          "description" : "Identifiers of CP(s) of the VNFC instance that were affected by the change.  Shall be present for those affected CPs of the VNFC instance that are associated to an external CP of the VNF instance. May be present for further affected CPs of the VNFC instance.\n",
-          "items" : {
-            "type" : "string",
-            "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-          }
-        },
-        "addedStorageResourceIds" : {
-          "type" : "array",
-          "description" : "References to VirtualStorage resources that have been added. Each value refers to a VirtualStorageResourceInfo item in the VnfInstance that was added to the VNFC. It shall be provided if at least one storage resource was added to the VNFC.\n",
-          "items" : {
-            "type" : "string",
-            "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-          }
-        },
-        "removedStorageResourceIds" : {
-          "type" : "array",
-          "description" : "References to VirtualStorage resources that have been removed. The value contains the identifier of a VirtualStorageResourceInfo item that has been removed from the VNFC, and might no longer exist in the VnfInstance. It shall be provided if at least one storage resource was removed from the VNFC.\n",
-          "items" : {
-            "type" : "string",
-            "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-          }
-        }
-      },
-      "description" : "This type provides information about added, deleted, modified and temporary VNFCs.  \n",
-      "example" : {
-        "addedStorageResourceIds" : [ "addedStorageResourceIds", "addedStorageResourceIds" ],
-        "metadata" : "{}",
-        "changeType" : "ADDED",
-        "affectedVnfcCpIds" : [ "affectedVnfcCpIds", "affectedVnfcCpIds" ],
-        "id" : "id",
-        "vduId" : "vduId",
-        "computeResource" : {
-          "resourceId" : "resourceId",
-          "vimConnectionId" : "vimConnectionId",
-          "vimLevelResourceType" : "vimLevelResourceType",
-          "resourceProviderId" : "resourceProviderId"
-        },
-        "removedStorageResourceIds" : [ "removedStorageResourceIds", "removedStorageResourceIds" ]
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_changedExtConnectivity" : {
-      "required" : [ "id", "resourceHandle" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "resourceHandle" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_computeResource"
-        },
-        "extLinkPorts" : {
-          "type" : "array",
-          "description" : "Link ports of this VL.\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_extLinkPorts"
-          }
-        }
-      },
-      "example" : {
-        "resourceHandle" : {
-          "resourceId" : "resourceId",
-          "vimConnectionId" : "vimConnectionId",
-          "vimLevelResourceType" : "vimLevelResourceType",
-          "resourceProviderId" : "resourceProviderId"
-        },
-        "extLinkPorts" : [ {
-          "resourceHandle" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "id" : "id",
-          "cpInstanceId" : "cpInstanceId"
-        }, {
-          "resourceHandle" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "id" : "id",
-          "cpInstanceId" : "cpInstanceId"
-        } ],
-        "id" : "id"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_error" : {
-      "required" : [ "detail", "status" ],
-      "properties" : {
-        "type" : {
-          "type" : "string",
-          "format" : "URI",
-          "description" : "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n"
-        },
-        "title" : {
-          "type" : "string",
-          "description" : "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n"
-        },
-        "status" : {
-          "type" : "integer",
-          "description" : "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n"
-        },
-        "detail" : {
-          "type" : "string",
-          "description" : "A human-readable explanation specific to this occurrence of the problem.\n"
-        },
-        "instance" : {
-          "type" : "string",
-          "format" : "URI",
-          "description" : "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n"
-        }
-      },
-      "description" : "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-      "example" : {
-        "instance" : "instance",
-        "detail" : "detail",
-        "type" : "type",
-        "title" : "title",
-        "status" : 0
-      }
-    },
-    "VnfLcmOperationOccurrenceNotification" : {
-      "type" : "object",
-      "required" : [ "_links", "id", "isAutomaticInvocation", "notificationStatus", "notificationType", "operation", "operationState", "subscriptionId", "timeStamp", "vnfInstanceId", "vnfLcmOpOccId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "notificationType" : {
-          "type" : "string",
-          "description" : "Discriminator for the different notification types. Shall be set to \"VnfLcmOperationOccurrenceNotification\" for this notification type.\n",
-          "enum" : [ "VnfLcmOperationOccurrenceNotification" ]
-        },
-        "subscriptionId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "timeStamp" : {
-          "type" : "string",
-          "format" : "date-time",
-          "description" : "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n"
-        },
-        "notificationStatus" : {
-          "type" : "string",
-          "description" : "Indicates whether this notification reports about the start of a lifecycle operation or the result of a lifecycle operation. Permitted values: * START: Informs about the start of the VNF LCM operation\n  occurrence.\n* RESULT: Informs about the final or intermediate result of the VNF\n  LCM operation occurrence.\n",
-          "enum" : [ "START", "RESULT" ]
-        },
-        "operationState" : {
-          "type" : "string",
-          "description" : "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-          "enum" : [ "STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK" ]
-        },
-        "vnfInstanceId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "operation" : {
-          "type" : "string",
-          "description" : "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.     \n",
-          "enum" : [ "INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO" ]
-        },
-        "isAutomaticInvocation" : {
-          "type" : "boolean",
-          "description" : "Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM  (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise.\n"
-        },
-        "vnfLcmOpOccId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "affectedVnfcs" : {
-          "type" : "array",
-          "description" : "Information about VNFC instances that were affected during the lifecycle operation. Shall be present if the \"notificationStatus\" is set to \"RESULT\" and the operation has performed any resource modification. Shall be absent otherwise. This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the VNF LCM operation occurrence and by any of the error handling procedures for that operation occurrence.\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_affectedVnfcs"
-          }
-        },
-        "affectedVirtualLinks" : {
-          "type" : "array",
-          "description" : "Information about VL instances that were affected during the lifecycle operation. Shall be present if the \"notificationStatus\" is set to \"RESULT\" and the operation has performed any resource modification. Shall be absent otherwise. This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the VNF LCM operation occurrence and by any of the error handling procedures for that operation occurrence.\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_affectedVirtualLinks"
-          }
-        },
-        "affectedVirtualStorages" : {
-          "type" : "array",
-          "description" : "Information about virtualised storage instances that were affected during the lifecycle operation. Shall be present if the \"notificationStatus\" is set to \"RESULT\" and the operation has performed any resource modification. Shall be absent otherwise. This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the VNF LCM operation occurrence and by any of the error handling procedures for that operation occurrence.\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_affectedVirtualStorages"
-          }
-        },
-        "changedInfo" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_changedInfo"
-        },
-        "changedExtConnectivity" : {
-          "type" : "array",
-          "description" : "Information about changed external connectivity, if this notification represents the result of a lifecycle operation occurrence. Shall be present if the \"notificationStatus\" is set to \"RESULT\" and the \"operation\" is set to \"CHANGE_EXT_CONN\".  Shall be absent otherwise.\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_changedExtConnectivity"
-          }
-        },
-        "error" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_error"
-        },
-        "_links" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links"
-        }
-      },
-      "description" : "This type represents a VNF lifecycle management operation occurrence notification, which informs the receiver of changes in the VNF lifecycle caused by a VNF LCM operation occurrence. The support of the notification is mandatory. This notification shall be triggered by the VNFM when there is a change in the VNF lifecycle caused by a VNF LCM operation occurrence, including: * Instantiation of the VNF * Scaling of the VNF instance (including auto-scaling) * Healing of the VNF instance (including auto-healing) * Change of the state of the VNF instance (i.e. Operate VNF) * Change of the deployment flavour of the VNF instance * Change of the external connectivity of the VNF instance * Termination of the VNF instance * Modification of VNF instance information and/or VNF configurable\n  properties through the \"PATCH\" method on the \"Individual VNF instance\"\n  resource.\nIf this is the initial notification about the start of a VNF LCM operation occurrence, it is assumed that the notification is sent by the VNFM before any action (including sending the grant request) is taken as part of the LCM operation. Due to possible race conditions, the \"start\" notification, the grant request and the LCM operation acknowledgment can arrive in any order at the NFVO, and the NFVO shall be able to handle such a situation. If this is a notification about a final or intermediate result state of a VNF LCM operation occurrence, the notification shall be sent after all related actions of the LCM operation that led to this state have  been executed. The new state shall be set in the VnfLcmOpOcc resource before the notification about the state change is sent.\n",
-      "example" : {
-        "notificationStatus" : "START",
-        "affectedVirtualLinks" : [ {
-          "metadata" : "{}",
-          "networkResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "changeType" : "ADDED",
-          "virtualLinkDescId" : "virtualLinkDescId",
-          "id" : "id"
-        }, {
-          "metadata" : "{}",
-          "networkResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "changeType" : "ADDED",
-          "virtualLinkDescId" : "virtualLinkDescId",
-          "id" : "id"
-        } ],
-        "affectedVirtualStorages" : [ {
-          "metadata" : "{}",
-          "virtualStorageDescId" : "virtualStorageDescId",
-          "changeType" : "ADDED",
-          "id" : "id",
-          "storageResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          }
-        }, {
-          "metadata" : "{}",
-          "virtualStorageDescId" : "virtualStorageDescId",
-          "changeType" : "ADDED",
-          "id" : "id",
-          "storageResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          }
-        } ],
-        "affectedVnfcs" : [ {
-          "addedStorageResourceIds" : [ "addedStorageResourceIds", "addedStorageResourceIds" ],
-          "metadata" : "{}",
-          "changeType" : "ADDED",
-          "affectedVnfcCpIds" : [ "affectedVnfcCpIds", "affectedVnfcCpIds" ],
-          "id" : "id",
-          "vduId" : "vduId",
-          "computeResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "removedStorageResourceIds" : [ "removedStorageResourceIds", "removedStorageResourceIds" ]
-        }, {
-          "addedStorageResourceIds" : [ "addedStorageResourceIds", "addedStorageResourceIds" ],
-          "metadata" : "{}",
-          "changeType" : "ADDED",
-          "affectedVnfcCpIds" : [ "affectedVnfcCpIds", "affectedVnfcCpIds" ],
-          "id" : "id",
-          "vduId" : "vduId",
-          "computeResource" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "removedStorageResourceIds" : [ "removedStorageResourceIds", "removedStorageResourceIds" ]
-        } ],
-        "_links" : {
-          "subscription" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfLcmOpOcc" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfInstance" : {
-            "href" : "http://example.com/aeiou"
-          }
-        },
-        "operationState" : "STARTING",
-        "notificationType" : "VnfLcmOperationOccurrenceNotification",
-        "error" : {
-          "instance" : "instance",
-          "detail" : "detail",
-          "type" : "type",
-          "title" : "title",
-          "status" : 0
-        },
-        "timeStamp" : "2000-01-23T04:56:07.000+00:00",
-        "vnfInstanceId" : "vnfInstanceId",
-        "vnfLcmOpOccId" : "vnfLcmOpOccId",
-        "changedInfo" : {
-          "vnfProductName" : "vnfProductName",
-          "metadata" : "{}",
-          "extensions" : "{}",
-          "vimConnectionInfo" : [ {
-            "vimType" : "vimType",
-            "vimId" : "vimId",
-            "extra" : "{}",
-            "interfaceInfo" : "{}",
-            "id" : "id",
-            "accessInfo" : "{}"
-          }, {
-            "vimType" : "vimType",
-            "vimId" : "vimId",
-            "extra" : "{}",
-            "interfaceInfo" : "{}",
-            "id" : "id",
-            "accessInfo" : "{}"
-          } ],
-          "vnfdVersion" : "vnfdVersion",
-          "vnfProvider" : "vnfProvider",
-          "vnfConfigurableProperties" : "{}",
-          "vnfPkgId" : "vnfPkgId",
-          "vnfdId" : "vnfdId",
-          "vnfInstanceName" : "vnfInstanceName",
-          "vnfInstanceDescription" : "vnfInstanceDescription",
-          "vnfSoftwareVersion" : "vnfSoftwareVersion"
-        },
-        "changedExtConnectivity" : [ {
-          "resourceHandle" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "extLinkPorts" : [ {
-            "resourceHandle" : {
-              "resourceId" : "resourceId",
-              "vimConnectionId" : "vimConnectionId",
-              "vimLevelResourceType" : "vimLevelResourceType",
-              "resourceProviderId" : "resourceProviderId"
-            },
-            "id" : "id",
-            "cpInstanceId" : "cpInstanceId"
-          }, {
-            "resourceHandle" : {
-              "resourceId" : "resourceId",
-              "vimConnectionId" : "vimConnectionId",
-              "vimLevelResourceType" : "vimLevelResourceType",
-              "resourceProviderId" : "resourceProviderId"
-            },
-            "id" : "id",
-            "cpInstanceId" : "cpInstanceId"
-          } ],
-          "id" : "id"
-        }, {
-          "resourceHandle" : {
-            "resourceId" : "resourceId",
-            "vimConnectionId" : "vimConnectionId",
-            "vimLevelResourceType" : "vimLevelResourceType",
-            "resourceProviderId" : "resourceProviderId"
-          },
-          "extLinkPorts" : [ {
-            "resourceHandle" : {
-              "resourceId" : "resourceId",
-              "vimConnectionId" : "vimConnectionId",
-              "vimLevelResourceType" : "vimLevelResourceType",
-              "resourceProviderId" : "resourceProviderId"
-            },
-            "id" : "id",
-            "cpInstanceId" : "cpInstanceId"
-          }, {
-            "resourceHandle" : {
-              "resourceId" : "resourceId",
-              "vimConnectionId" : "vimConnectionId",
-              "vimLevelResourceType" : "vimLevelResourceType",
-              "resourceProviderId" : "resourceProviderId"
-            },
-            "id" : "id",
-            "cpInstanceId" : "cpInstanceId"
-          } ],
-          "id" : "id"
-        } ],
-        "id" : "id",
-        "subscriptionId" : "subscriptionId",
-        "isAutomaticInvocation" : true,
-        "operation" : "INSTANTIATE"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_extLinkPorts" : {
-      "required" : [ "id", "resourceHandle" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "resourceHandle" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_computeResource"
-        },
-        "cpInstanceId" : {
-          "type" : "string",
-          "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-        }
-      },
-      "description" : "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL. \n",
-      "example" : {
-        "resourceHandle" : {
-          "resourceId" : "resourceId",
-          "vimConnectionId" : "vimConnectionId",
-          "vimLevelResourceType" : "vimLevelResourceType",
-          "resourceProviderId" : "resourceProviderId"
-        },
-        "id" : "id",
-        "cpInstanceId" : "cpInstanceId"
-      }
-    },
-    "VnfIdentifierCreationNotification" : {
-      "type" : "object",
-      "required" : [ "_links", "id", "notificationType", "timeStamp", "vnfInstanceId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "notificationType" : {
-          "type" : "string",
-          "description" : "Discriminator for the different notification types. Shall be set to \"VnfIdentifierCreationNotification\" for this notification type.\n",
-          "enum" : [ "VnfIdentifierCreationNotification" ]
-        },
-        "subscriptionId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "timeStamp" : {
-          "type" : "string",
-          "format" : "date-time",
-          "description" : "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n"
-        },
-        "vnfInstanceId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "_links" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links"
-        }
-      },
-      "description" : "This type represents a VNF identifier creation notification, which informs the receiver of the creation of a new VNF instance resource and the associated VNF instance identifier. This notification shall be triggered by the VNFM when it has created a VNF instance resource and the associated VNF instance identifier.\n",
-      "example" : {
-        "timeStamp" : "2000-01-23T04:56:07.000+00:00",
-        "vnfInstanceId" : "vnfInstanceId",
-        "_links" : {
-          "subscription" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfLcmOpOcc" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfInstance" : {
-            "href" : "http://example.com/aeiou"
-          }
-        },
-        "id" : "id",
-        "notificationType" : "VnfIdentifierCreationNotification",
-        "subscriptionId" : "subscriptionId"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification__links_vnfInstance" : {
-      "required" : [ "href" ],
-      "properties" : {
-        "href" : {
-          "type" : "string",
-          "format" : "url",
-          "description" : "URI of the referenced resource.\n"
-        }
-      },
-      "description" : "This type represents a link to a resource.\n",
-      "example" : {
-        "href" : "http://example.com/aeiou"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_changedInfo" : {
-      "properties" : {
-        "vnfInstanceName" : {
-          "type" : "string",
-          "description" : "If present, this attribute signals modifications of the \"vnfInstanceName\" attribute in \"VnfInstance\".\n"
-        },
-        "vnfInstanceDescription" : {
-          "type" : "string",
-          "description" : "If present, this attribute signals modifications of the \"vnfInstanceDescription\" attribute in \"VnfInstance\".\n"
-        },
-        "vnfConfigurableProperties" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "metadata" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "extensions" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        },
-        "vimConnectionInfo" : {
-          "type" : "array",
-          "description" : "If present, this attribute signals modifications of certain entries in the \"vimConnectionInfo\" attribute array in \"VnfInstance\".\n",
-          "items" : {
-            "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_changedInfo_vimConnectionInfo"
-          }
-        },
-        "vnfPkgId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "vnfdId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "vnfProvider" : {
-          "type" : "string",
-          "description" : "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n"
-        },
-        "vnfProductName" : {
-          "type" : "string",
-          "description" : "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n"
-        },
-        "vnfSoftwareVersion" : {
-          "type" : "string",
-          "description" : "A Version.\n"
-        },
-        "vnfdVersion" : {
-          "type" : "string",
-          "description" : "A Version.\n"
-        }
-      },
-      "description" : "This type represents attribute modifications that were performed on an \"Individual VNF instance\" resource. The attributes that can be included consist of those requested to be modified explicitly in the \"VnfInfoModificationRequest\" data structure, and additional attributes of the \"VnfInstance\" data structure that were modified implicitly e.g. when modifying the referenced VNF package.\n",
-      "example" : {
-        "vnfProductName" : "vnfProductName",
-        "metadata" : "{}",
-        "extensions" : "{}",
-        "vimConnectionInfo" : [ {
-          "vimType" : "vimType",
-          "vimId" : "vimId",
-          "extra" : "{}",
-          "interfaceInfo" : "{}",
-          "id" : "id",
-          "accessInfo" : "{}"
-        }, {
-          "vimType" : "vimType",
-          "vimId" : "vimId",
-          "extra" : "{}",
-          "interfaceInfo" : "{}",
-          "id" : "id",
-          "accessInfo" : "{}"
-        } ],
-        "vnfdVersion" : "vnfdVersion",
-        "vnfProvider" : "vnfProvider",
-        "vnfConfigurableProperties" : "{}",
-        "vnfPkgId" : "vnfPkgId",
-        "vnfdId" : "vnfdId",
-        "vnfInstanceName" : "vnfInstanceName",
-        "vnfInstanceDescription" : "vnfInstanceDescription",
-        "vnfSoftwareVersion" : "vnfSoftwareVersion"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_affectedVirtualStorages" : {
-      "required" : [ "changeType", "id", "storageResource", "virtualStorageDescId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-        },
-        "virtualStorageDescId" : {
-          "type" : "string",
-          "description" : "An identifier that is unique within a VNF descriptor.\n"
-        },
-        "changeType" : {
-          "type" : "string",
-          "description" : "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVirtualStorage structure exists as long as the temporary resource exists.\n",
-          "enum" : [ "ADDED", "REMOVED", "MODIFIED", "TEMPORARY" ]
-        },
-        "storageResource" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_computeResource"
-        },
-        "metadata" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        }
-      },
-      "description" : "This type provides information about added, deleted, modified and temporary virtual storage resources.\n",
-      "example" : {
-        "metadata" : "{}",
-        "virtualStorageDescId" : "virtualStorageDescId",
-        "changeType" : "ADDED",
-        "id" : "id",
-        "storageResource" : {
-          "resourceId" : "resourceId",
-          "vimConnectionId" : "vimConnectionId",
-          "vimLevelResourceType" : "vimLevelResourceType",
-          "resourceProviderId" : "resourceProviderId"
-        }
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification__links" : {
-      "required" : [ "subscription", "vnfInstance" ],
-      "properties" : {
-        "vnfInstance" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links_vnfInstance"
-        },
-        "subscription" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links_vnfInstance"
-        },
-        "vnfLcmOpOcc" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links_vnfInstance"
-        }
-      },
-      "description" : "This type represents the links to resources that a notification can contain.\n",
-      "example" : {
-        "subscription" : {
-          "href" : "http://example.com/aeiou"
-        },
-        "vnfLcmOpOcc" : {
-          "href" : "http://example.com/aeiou"
-        },
-        "vnfInstance" : {
-          "href" : "http://example.com/aeiou"
-        }
-      }
-    },
-    "VnfIdentifierDeletionNotification" : {
-      "type" : "object",
-      "required" : [ "_links", "id", "notificationType", "timeStamp", "vnfInstanceId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "notificationType" : {
-          "type" : "string",
-          "description" : "Discriminator for the different notification types. Shall be set to \"VnfIdentifierDeletionNotification\" for this notification type.\n",
-          "enum" : [ "VnfIdentifierDeletionNotification" ]
-        },
-        "subscriptionId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "timeStamp" : {
-          "type" : "string",
-          "format" : "date-time",
-          "description" : "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n"
-        },
-        "vnfInstanceId" : {
-          "type" : "string",
-          "description" : "An identifier with the intention of being globally unique.\n"
-        },
-        "_links" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification__links"
-        }
-      },
-      "description" : "This type represents a VNF identifier deletion notification, which informs the receiver of the deletion of a new VNF instance resource and the associated VNF instance identifier. This notification shall be triggered by the VNFM when it has deleted a VNF instance resource and the associated VNF instance identifier.\n",
-      "example" : {
-        "timeStamp" : "2000-01-23T04:56:07.000+00:00",
-        "vnfInstanceId" : "vnfInstanceId",
-        "_links" : {
-          "subscription" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfLcmOpOcc" : {
-            "href" : "http://example.com/aeiou"
-          },
-          "vnfInstance" : {
-            "href" : "http://example.com/aeiou"
-          }
-        },
-        "id" : "id",
-        "notificationType" : "VnfIdentifierDeletionNotification",
-        "subscriptionId" : "subscriptionId"
-      }
-    },
-    "lcnVnfLcmOperationOccurrenceNotification_affectedVirtualLinks" : {
-      "required" : [ "changeType", "id", "networkResource", "virtualLinkDescId" ],
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "description" : "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n"
-        },
-        "virtualLinkDescId" : {
-          "type" : "string",
-          "description" : "An identifier that is unique within a VNF descriptor.\n"
-        },
-        "changeType" : {
-          "type" : "string",
-          "description" : "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY * LINK_PORT_ADDED * LINK_PORT_REMOVED For a temporary resource, an AffectedVirtualLink structure exists as long as the temporary resource exists.\n",
-          "enum" : [ "ADDED", "REMOVED", "MODIFIED", "TEMPORARY", "LINK_PORT_ADDED", "LINK_PORT_REMOVED" ]
-        },
-        "networkResource" : {
-          "$ref" : "#/definitions/lcnVnfLcmOperationOccurrenceNotification_computeResource"
-        },
-        "metadata" : {
-          "type" : "object",
-          "description" : "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159. \n",
-          "properties" : { }
-        }
-      },
-      "description" : "This type provides information about added, deleted, modified and temporary VLs.\n",
-      "example" : {
-        "metadata" : "{}",
-        "networkResource" : {
-          "resourceId" : "resourceId",
-          "vimConnectionId" : "vimConnectionId",
-          "vimLevelResourceType" : "vimLevelResourceType",
-          "resourceProviderId" : "resourceProviderId"
-        },
-        "changeType" : "ADDED",
-        "virtualLinkDescId" : "virtualLinkDescId",
-        "id" : "id"
-      }
-    }
-  },
-  "externalDocs" : {
-    "description" : "ETSI GS NFV-SOL 003 V2.4.1",
-    "url" : "http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.04.01_60/gs_NFV-SOL003v020401p.pdf"
-  }
-}
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json
deleted file mode 100644
index aab56ee2af..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/SOL003-VNFLifecycleOperationGranting-API.json
+++ /dev/null
@@ -1,2774 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.1.1",
-    "title": "SOL003 - VNF Lifecycle Operation Granting interface",
-    "description": "SOL003 - VNF Lifecycle Operation Granting interface\n\nIMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.\n\nIn clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based filtering mechanism is defined. This mechanism is currently not included in the corresponding OpenAPI design for this GS version. Changes to the attribute-based filtering mechanism are being considered in v2.5.1 of this GS for inclusion in the corresponding future ETSI NFV OpenAPI design.\nPlease report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=\n",
-    "license": {
-      "name": "ETSI Forge copyright notice",
-      "url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
-    }
-  },
-  "externalDocs": {
-    "description": "ETSI GS NFV-SOL 003 V2.4.1",
-    "url": "http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.04.01_60/gs_NFV-SOL003v020401p.pdf"
-  },
-  "basePath": "/grant/v1",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/grants": {
-      "post": {
-        "description": "Grant Lifecycle Operation\n\nThe POST method requests a grant for a particular VNF lifecycle operation.\n",
-        "parameters": [
-          {
-            "name": "GrantRequest",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "description": "This type represents a grant request.\n",
-              "type": "object",
-              "required": [
-                "vnfInstanceId",
-                "vnfLcmOpOccId",
-                "vnfdId",
-                "operation",
-                "isAutomaticInvocation",
-                "_links"
-              ],
-              "properties": {
-                "vnfInstanceId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfLcmOpOccId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfdId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "flavourId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "operation": {
-                  "description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-                  "type": "string",
-                  "enum": [
-                    "INSTANTIATE",
-                    "SCALE",
-                    "SCALE_TO_LEVEL",
-                    "CHANGE_FLAVOUR",
-                    "TERMINATE",
-                    "HEAL",
-                    "OPERATE",
-                    "CHANGE_EXT_CONN",
-                    "MODIFY_INFO"
-                  ]
-                },
-                "isAutomaticInvocation": {
-                  "description": "Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM  (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal).  Set to false otherwise.\n",
-                  "type": "boolean"
-                },
-                "instantiationLevelId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "addResources": {
-                  "description": "List of resource definitions in the VNFD for resources to be added by the LCM operation which is related to this grant request, with one entry per resource. If the granting request is for InstantiateVNF, either instantiationLevel or addResources shall be present.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information of an existing or proposed resource used by the VNF.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "type"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "type": {
-                        "description": "Type of the resource definition referenced. Permitted values: * COMPUTE * VL * STORAGE * LINKPORT\n",
-                        "type": "string",
-                        "enum": [
-                          "COMPUTE",
-                          "VL",
-                          "STORAGE",
-                          "LINKPORT"
-                        ]
-                      },
-                      "vduId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resourceTemplateId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resource": {
-                        "required": [
-                          "vimConnectionId",
-                          "resourceId"
-                        ],
-                        "type": "object",
-                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          },
-                          "vimLevelResourceType": {
-                            "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "tempResources": {
-                  "description": "List of resource definitions in the VNFD for resources to be temporarily instantiated during the runtime of the LCM operation which is related to this grant request, with one entry per resource. The NFVO will assume that the VNFM will be responsible to both allocate and release the temporary resource during the runtime of the LCM operation. This means, the resource can be allocated and consumed after the \"start\" notification for the LCM operation is sent by the VNFM, and the resource will be released before the \"result\" notification of the VNF LCM operation is sent by the VNFM.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information of an existing or proposed resource used by the VNF.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "type"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "type": {
-                        "description": "Type of the resource definition referenced. Permitted values: * COMPUTE * VL * STORAGE * LINKPORT\n",
-                        "type": "string",
-                        "enum": [
-                          "COMPUTE",
-                          "VL",
-                          "STORAGE",
-                          "LINKPORT"
-                        ]
-                      },
-                      "vduId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resourceTemplateId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resource": {
-                        "required": [
-                          "vimConnectionId",
-                          "resourceId"
-                        ],
-                        "type": "object",
-                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          },
-                          "vimLevelResourceType": {
-                            "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "removeResources": {
-                  "description": "Provides the definitions of resources to be removed by the LCM operation which is related to this grant request, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information of an existing or proposed resource used by the VNF.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "type"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "type": {
-                        "description": "Type of the resource definition referenced. Permitted values: * COMPUTE * VL * STORAGE * LINKPORT\n",
-                        "type": "string",
-                        "enum": [
-                          "COMPUTE",
-                          "VL",
-                          "STORAGE",
-                          "LINKPORT"
-                        ]
-                      },
-                      "vduId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resourceTemplateId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resource": {
-                        "required": [
-                          "vimConnectionId",
-                          "resourceId"
-                        ],
-                        "type": "object",
-                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          },
-                          "vimLevelResourceType": {
-                            "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "updateResources": {
-                  "description": "Provides the definitions of resources to be modified by the LCM operation which is related to this grant request, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information of an existing or proposed resource used by the VNF.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "type"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "type": {
-                        "description": "Type of the resource definition referenced. Permitted values: * COMPUTE * VL * STORAGE * LINKPORT\n",
-                        "type": "string",
-                        "enum": [
-                          "COMPUTE",
-                          "VL",
-                          "STORAGE",
-                          "LINKPORT"
-                        ]
-                      },
-                      "vduId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resourceTemplateId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "resource": {
-                        "required": [
-                          "vimConnectionId",
-                          "resourceId"
-                        ],
-                        "type": "object",
-                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          },
-                          "vimLevelResourceType": {
-                            "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "placementConstraints": {
-                  "description": "Placement constraints that the VNFM may send to the NFVO in order to influence the resource placement decision. If sent, the NFVO shall take the constraints into consideration when making resource placement decisions, and shall reject the grant if they cannot be honoured. The affinity/anti-affinity rules defined in the VNFD , and the placement constraints in the GrantVnfLifecycleOperation as defined in this clause should be conflict-free. In case of conflicts, the placement constraints in the GrantVnfLifecycleOperation shall take precedence. Passing constraints allows the VNFM or the lifecycle management scripts to influence resource placement decisions by the NFVO to ensure VNF properties such as performance or fault tolerance.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a resource placement constraint. A set of such constraints may be sent by the VNFM to the NFVO to influence the resource placement decisions made by the NFVO as part of the granting process. A placement constraint defines a condition to the placement of new resources, considering other new resources as well as existing resources. EXAMPLE: The following rules influence the placement of a set of resources such that they are placed in the same Network Function Virtualisation Infrastructure Point of Presence (NFVI-PoP) but in different resource zones: {type=\"affinity\"; scope=\"NFVI_POP\"; {resource1,resource2}} {type=\"anti-affinity\"; scope=\"ZONE\"; {resource1,resource2}}\n",
-                    "type": "object",
-                    "required": [
-                      "affinityOrAntiAffinity",
-                      "scope",
-                      "resource"
-                    ],
-                    "properties": {
-                      "affinityOrAntiAffinity": {
-                        "description": "The type of the constraint. Permitted values: * AFFINITY * ANTI_AFFINITY\n",
-                        "type": "string",
-                        "enum": [
-                          "AFFINITY",
-                          "ANTI_AFFINITY"
-                        ]
-                      },
-                      "scope": {
-                        "description": "The scope of the placement constraint indicating the category of the \"place\" where the constraint applies. Permitted values: * NFVI_POP * ZONE * ZONE_GROUP * NFVI_NODE\n",
-                        "type": "string",
-                        "enum": [
-                          "NFVI_POP",
-                          "ZONE",
-                          "ZONE_GROUP",
-                          "NFVI_NODE"
-                        ]
-                      },
-                      "resource": {
-                        "description": "References to resources in the constraint rule.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type references a resource either by its VIM-level identifier for existing resources, or by the identifier of a \"ResourceDefinition\" structure in the \"GrantRequest\" structure for new resources.\n",
-                          "type": "object",
-                          "required": [
-                            "idType",
-                            "resourceId"
-                          ],
-                          "properties": {
-                            "idType": {
-                              "description": "The type of the identifier. Permitted values: * RES_MGMT: Resource-management-level identifier; this identifier is  managed by the VIM in the direct mode of VNF-related resource\n  management, and is managed by the NFVO in the indirect mode)\n* GRANT: Reference to the identifier of a \"ResourceDefinition\" structure in the \"GrantRequest\" structure.\n",
-                              "type": "string",
-                              "enum": [
-                                "RES_MGMT",
-                                "GRANT"
-                              ]
-                            },
-                            "resourceId": {
-                              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                              "type": "string"
-                            },
-                            "vimConnectionId": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            },
-                            "resourceProviderId": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "vimConstraints": {
-                  "description": "Used by the VNFM to require that multiple resources are managed through the same VIM connection. If sent, the NFVO shall take the constraints into consideration when making VIM selection decisions, and shall reject the grant if they cannot be honoured. This attribute shall be supported if VNF-related Resource Management in direct mode is applicable. The applicability and further details of this attribute for indirect mode are left for future specification.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a VIM selection constraint. A set of such constraints may be sent by the VNFM to the NFVO to influence the VIM selection decisions made by the NFVO as part of the granting process.\n",
-                    "type": "object",
-                    "required": [
-                      "resource"
-                    ],
-                    "properties": {
-                      "sameResourceGroup": {
-                        "description": "If present and set to true, this signals that the constraint applies not only to the same VIM connection, but also to the same infrastructure resource group.\n",
-                        "type": "boolean"
-                      },
-                      "resource": {
-                        "description": "References to resources in the constraint rule. The NFVO shall ensure that all resources in this list are managed through the same VIM connection. If \"sameResourceGroup\" is set to true, the NFVO shall further ensure that all resources in this list are part of the same infrastructure resource group in that VIM connection.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type references a resource either by its VIM-level identifier for existing resources, or by the identifier of a \"ResourceDefinition\" structure in the \"GrantRequest\" structure for new resources.\n",
-                          "type": "object",
-                          "required": [
-                            "idType",
-                            "resourceId"
-                          ],
-                          "properties": {
-                            "idType": {
-                              "description": "The type of the identifier. Permitted values: * RES_MGMT: Resource-management-level identifier; this identifier is  managed by the VIM in the direct mode of VNF-related resource\n  management, and is managed by the NFVO in the indirect mode)\n* GRANT: Reference to the identifier of a \"ResourceDefinition\" structure in the \"GrantRequest\" structure.\n",
-                              "type": "string",
-                              "enum": [
-                                "RES_MGMT",
-                                "GRANT"
-                              ]
-                            },
-                            "resourceId": {
-                              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                              "type": "string"
-                            },
-                            "vimConnectionId": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            },
-                            "resourceProviderId": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "additionalParams": {
-                  "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                  "type": "object"
-                },
-                "_links": {
-                  "description": "Links to resources related to this request.\n",
-                  "type": "object",
-                  "required": [
-                    "vnfLcmOpOcc",
-                    "vnfInstance"
-                  ],
-                  "properties": {
-                    "vnfLcmOpOcc": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    },
-                    "vnfInstance": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Content-Type",
-            "description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "Created\nThe grant was created successfully (synchronous mode). A representation of the created \"Individual grant\" resource shall be returned in the response body. The HTTP response shall include a \"Location\" HTTP header that indicates the URI of the \"Individual grant\" resource just created.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Location": {
-                "description": "The resource URI of the created VNF instance",
-                "type": "string",
-                "format": "url"
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "This type represents a grant.\n",
-              "type": "object",
-              "required": [
-                "id",
-                "vnfInstanceId",
-                "vnfLcmOpOccId",
-                "_links"
-              ],
-              "properties": {
-                "id": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfInstanceId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfLcmOpOccId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vimConnections": {
-                  "description": "Provides information regarding VIM connections that are approved to be used by the VNFM to allocate resources, and provides parameters of these VIM connections. The VNFM shall update the \" vimConnectionInfo\" attribute of the \"VnfInstance\" structure by adding unknown entries received in this attribute. This attribute is not intended for the modification of VimConnection entries passed earlier; for that, the VnfInfoModificationRequest structure shall be used. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable. In direct mode, this parameter shall be absent if the VIM information was configured to the VNFM in another way, present otherwise. This interface allows to signal the use of multiple VIMs per VNF. However, due to the partial support of this feature in the present release, it is recommended in the present document that the number of entries in the \"vims\" attribute in the Grant is not greater than 1.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "vimType"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimType": {
-                        "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-                        "type": "string"
-                      },
-                      "interfaceInfo": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      },
-                      "accessInfo": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      },
-                      "extra": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      }
-                    }
-                  }
-                },
-                "zones": {
-                  "description": "Identifies resource zones where the resources are approved to be allocated by the VNFM.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a resource zone.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "zoneId"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "zoneGroups": {
-                  "description": "Information about groups of resource zones that are related and that the NFVO has chosen to fulfil a zoneGroup constraint in the GrantVnfLifecycleOperation request. This information confirms that the NFVO has honoured the zoneGroup constraints that were passed as part of \"placementConstraints\" in the GrantRequest.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a resource zone group. A resource zone group is a group of one or more related resource zones which can be used in resource placement constraints. To fulfil such constraint, the NFVO may decide to place a resource into any zone that belongs to a particular group. NOTE: A resource zone group can be used to support overflow from one resource zone into another, in case a particular deployment supports only non-elastic resource zones.\n",
-                    "type": "object",
-                    "required": [
-                      "zoneId"
-                    ],
-                    "properties": {
-                      "zoneId": {
-                        "description": "References of identifiers of \"ZoneInfo\" structures, each of which provides information about a resource zone that belongs to this group.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  }
-                },
-                "computeReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "networkReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "storageReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "addResources": {
-                  "description": "List of resources that are approved to be added, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "tempResources": {
-                  "description": "List of resources that are approved to be temporarily instantiated during the runtime of the lifecycle operation, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "removeResources": {
-                  "description": "List of resources that are approved to be removed, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "updateResources": {
-                  "description": "List of resources that are approved to be modified, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "vimAssets": {
-                  "description": "Information about assets for the VNF that are managed by the NFVO in the VIM, such as software images and virtualised compute resource flavours. This attribute is not intended for the modification of vimAssets entries passed earlier. Modification of VIM assets during the lifetime of a VNF instance is not necessary, since it is expected that all applicable assets have been on boarded into the VIM before the VNF is instantiated.\n",
-                  "type": "object",
-                  "properties": {
-                    "computeResourceFlavours": {
-                      "description": "Mappings between virtual compute descriptors defined in the VNFD and compute resource flavours managed in the VIM.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "If the VIM requires the use of virtual compute resource flavours during compute resource instantiation, it is assumed that such flavours are selected or created by the NFVO based on the information in the virtual compute descriptor defined in the VNFD. This type defines the mapping between a virtual compute descriptor in the VNFD and the corresponding compute resource flavour managed by the NFVO in the VIM.\n",
-                        "type": "object",
-                        "required": [
-                          "vnfdVirtualComputeDescId",
-                          "vimFlavourId"
-                        ],
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "vnfdVirtualComputeDescId": {
-                            "description": "An identifier that is unique within a VNF descriptor.\n",
-                            "type": "string"
-                          },
-                          "vimFlavourId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    },
-                    "softwareImages": {
-                      "description": "Mappings between software images defined in the VNFD and software images managed in the VIM.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "This type contains a mapping between a software image definition the VNFD and the corresponding software image managed by the NFVO in the VIM which is needed during compute resource instantiation.\n",
-                        "type": "object",
-                        "required": [
-                          "vnfdSoftwareImageId",
-                          "vimSoftwareImageId"
-                        ],
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "vnfdSoftwareImageId": {
-                            "description": "An identifier that is unique within a VNF descriptor.\n",
-                            "type": "string"
-                          },
-                          "vimSoftwareImageId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "extVirtualLinks": {
-                  "description": "Information about external VLs to connect the VNF to. External and/or externally-managed internal VLs can be passed in VNF lifecycle management operation requests such as InstantiateVnf or ChangeVnfFlavor, and/or in the grant response. The NFVO may choose to override in the grant response external and/or externally-managed VL instances that have been passed previously in the associated VNF lifecycle management request, if the lifecycle management request has originated from the NFVO itself.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents an external VL.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "resourceId",
-                      "extCps"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      },
-                      "extCps": {
-                        "description": "External CPs of the VNF to be connected to this external VL.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type represents configuration information for external CPs created from a CPD.\n",
-                          "type": "object",
-                          "required": [
-                            "cpdId"
-                          ],
-                          "properties": {
-                            "cpdId": {
-                              "description": "An identifier that is unique within a VNF descriptor.\n",
-                              "type": "string"
-                            },
-                            "cpConfig": {
-                              "description": "List of instance data that need to be configured on the CP instances created from the respective CPD.\n",
-                              "type": "array",
-                              "items": {
-                                "description": "This type represents an externally provided link port or network address information per instance of an external connection point. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the external VL. In a link port is not provided, the VNFM shall create a link port on the external VL, and use that link port to connect the external CP to the external VL.\n",
-                                "type": "object",
-                                "properties": {
-                                  "cpInstanceId": {
-                                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-                                    "type": "string"
-                                  },
-                                  "linkPortId": {
-                                    "description": "An identifier with the intention of being globally unique.\n",
-                                    "type": "string"
-                                  },
-                                  "cpProtocolData": {
-                                    "description": "Parameters for configuring the network protocols on the link port that connects the CP to a VL.  The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\":  * The \"linkPortId\" and \"cpProtocolData\" attributes shall both be  absent for the deletion of an existing external CP instance\n  addressed by cpInstanceId. \n* At least one of these attributes shall be present for a  to-be-created external CP instance or an existing external\n  CP instance.\n* If the \"linkPortId\" attribute is absent, the VNFM shall create a  link port.\n* If the \"cpProtocolData\" attribute is absent, the \"linkPortId\"  attribute shall be provided referencing a pre-created link port,\n  and the VNFM can use means outside the scope of the present\n  document to obtain the pre-configured address information for the\n  connection point from the resource representing the link port.\n* If both \"cpProtocolData\" and \"linkportId\" are provided, the API  consumer shall ensure that the cpProtocolData can be used with the\n  pre-created link port referenced by \"linkPortId\".\n",
-                                    "type": "array",
-                                    "items": {
-                                      "description": "This type represents network protocol data.\n",
-                                      "type": "object",
-                                      "required": [
-                                        "layerProtocol"
-                                      ],
-                                      "properties": {
-                                        "layerProtocol": {
-                                          "description": "Identifier of layer(s) and protocol(s). This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-                                          "type": "string",
-                                          "enum": [
-                                            "IP_OVER_ETHERNET"
-                                          ]
-                                        },
-                                        "ipOverEthernet": {
-                                          "description": "This type represents network address data for IP over Ethernet.\n",
-                                          "type": "object",
-                                          "properties": {
-                                            "macAddress": {
-                                              "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-                                              "type": "string",
-                                              "format": "MAC"
-                                            },
-                                            "ipAddresses": {
-                                              "description": "List of IP addresses to assign to the CP instance. Each entry represents IP address data for fixed or dynamic IP address assignment per subnet. If this attribute is not present, no IP address shall be assigned.\n",
-                                              "type": "array",
-                                              "items": {
-                                                "type": "object",
-                                                "required": [
-                                                  "type"
-                                                ],
-                                                "properties": {
-                                                  "type": {
-                                                    "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-                                                    "type": "string",
-                                                    "enum": [
-                                                      "IPV4",
-                                                      "IPV6"
-                                                    ]
-                                                  },
-                                                  "fixedAddresses": {
-                                                    "description": "Fixed addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-                                                    "type": "array",
-                                                    "items": {
-                                                      "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                      "type": "string",
-                                                      "format": "IP"
-                                                    }
-                                                  },
-                                                  "numDynamicAddresses": {
-                                                    "description": "Number of dynamic addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-                                                    "type": "integer"
-                                                  },
-                                                  "addressRange": {
-                                                    "description": "An IP address range to be used, e.g. in case of egress connections. In case this attribute is present, IP addresses from the range will be used.\n",
-                                                    "type": "object",
-                                                    "required": [
-                                                      "minAddress",
-                                                      "maxAddress"
-                                                    ],
-                                                    "properties": {
-                                                      "minAddress": {
-                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                        "type": "string",
-                                                        "format": "IP"
-                                                      },
-                                                      "maxAddress": {
-                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                        "type": "string",
-                                                        "format": "IP"
-                                                      }
-                                                    }
-                                                  },
-                                                  "subnetId": {
-                                                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                                                    "type": "string"
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "extLinkPorts": {
-                        "description": "Externally provided link ports to be used to connect external connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type represents an externally provided link port to be used to connect an external connection point to an external VL.\n",
-                          "type": "object",
-                          "required": [
-                            "id",
-                            "resourceHandle"
-                          ],
-                          "properties": {
-                            "id": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            },
-                            "resourceHandle": {
-                              "required": [
-                                "vimConnectionId",
-                                "resourceId"
-                              ],
-                              "type": "object",
-                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                              "properties": {
-                                "vimConnectionId": {
-                                  "description": "An identifier with the intention of being globally unique.\n",
-                                  "type": "string"
-                                },
-                                "resourceProviderId": {
-                                  "description": "An identifier with the intention of being globally unique.\n",
-                                  "type": "string"
-                                },
-                                "resourceId": {
-                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                                  "type": "string"
-                                },
-                                "vimLevelResourceType": {
-                                  "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                                  "type": "string"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "extManagedVirtualLinks": {
-                  "description": "Information about internal VLs that are managed by other entities than the VNFM. The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance to ensure that these networks have certain properties such as security or acceleration features, or to address particular network topologies. The present document assumes that externally-managed internal VLs are managed by the NFVO and created towards the VIM. External and/or externally-managed internal VLs can be passed in VNF lifecycle management operation requests such as InstantiateVnf or ChangeVnfFlavor, and/or in the grant response. The NFVO may choose to override in the grant response external and/or externally-managed VL instances that have been passed previously in the associated VNF lifecycle management request, if the lifecycle management request has originated from the NFVO itself.\n",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "virtualLinkDescId",
-                      "resourceId"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "virtualLinkDescId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "additionalParams": {
-                  "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                  "type": "object"
-                },
-                "_links": {
-                  "description": "Links to resources related to this resource.\n",
-                  "type": "object",
-                  "required": [
-                    "self",
-                    "vnfLcmOpOcc",
-                    "vnfInstance"
-                  ],
-                  "properties": {
-                    "self": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    },
-                    "vnfLcmOpOcc": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    },
-                    "vnfInstance": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "202": {
-            "description": "Accepted\nThe request was accepted for processing, but the processing has not been completed. It is expected to take some time to create the grant (asynchronous mode). The response body shall be empty. The HTTP response shall include a \"Location\" HTTP header that indicates the URI of the \"Individual grant\" resource that will be created once the granting decision has been made.\n",
-            "headers": {
-              "Location": {
-                "description": "The resource URI of the created VNF instance",
-                "type": "string",
-                "format": "url"
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            }
-          },
-          "400": {
-            "description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "Forbidden\nThe grant was rejected. A ProblemDetails structure shall be included in the response to provide more details about the rejection in the \"details\" attribute.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "Method Not Allowed\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "Requested Range Not Satisfiable\nThis code is returned if the requested byte range in the Range HTTP header is not present in the requested resource.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Unprocessable Entity\nIf the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem. NOTE 2: This error response code is only applicable for methods that have a request body.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/grants/{grantId}": {
-      "parameters": [
-        {
-          "name": "grantId",
-          "description": "Identifier of the grant. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request granting a new VNF lifecycle operation. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Grant Lifecycle Operation\n\nThe GET method retrieves information about a specific grant by reading an individual grant resource.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK\nThe grant was read successfully. A representation of the \"individual grant\" resource shall be returned in the response body.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "This type represents a grant.\n",
-              "type": "object",
-              "required": [
-                "id",
-                "vnfInstanceId",
-                "vnfLcmOpOccId",
-                "_links"
-              ],
-              "properties": {
-                "id": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfInstanceId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfLcmOpOccId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vimConnections": {
-                  "description": "Provides information regarding VIM connections that are approved to be used by the VNFM to allocate resources, and provides parameters of these VIM connections. The VNFM shall update the \" vimConnectionInfo\" attribute of the \"VnfInstance\" structure by adding unknown entries received in this attribute. This attribute is not intended for the modification of VimConnection entries passed earlier; for that, the VnfInfoModificationRequest structure shall be used. This attribute shall only be supported when VNF-related Resource Management in direct mode is applicable. In direct mode, this parameter shall be absent if the VIM information was configured to the VNFM in another way, present otherwise. This interface allows to signal the use of multiple VIMs per VNF. However, due to the partial support of this feature in the present release, it is recommended in the present document that the number of entries in the \"vims\" attribute in the Grant is not greater than 1.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "vimType"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimType": {
-                        "description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-                        "type": "string"
-                      },
-                      "interfaceInfo": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      },
-                      "accessInfo": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      },
-                      "extra": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      }
-                    }
-                  }
-                },
-                "zones": {
-                  "description": "Identifies resource zones where the resources are approved to be allocated by the VNFM.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a resource zone.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "zoneId"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "zoneGroups": {
-                  "description": "Information about groups of resource zones that are related and that the NFVO has chosen to fulfil a zoneGroup constraint in the GrantVnfLifecycleOperation request. This information confirms that the NFVO has honoured the zoneGroup constraints that were passed as part of \"placementConstraints\" in the GrantRequest.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type provides information regarding a resource zone group. A resource zone group is a group of one or more related resource zones which can be used in resource placement constraints. To fulfil such constraint, the NFVO may decide to place a resource into any zone that belongs to a particular group. NOTE: A resource zone group can be used to support overflow from one resource zone into another, in case a particular deployment supports only non-elastic resource zones.\n",
-                    "type": "object",
-                    "required": [
-                      "zoneId"
-                    ],
-                    "properties": {
-                      "zoneId": {
-                        "description": "References of identifiers of \"ZoneInfo\" structures, each of which provides information about a resource zone that belongs to this group.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  }
-                },
-                "computeReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "networkReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "storageReservationId": {
-                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                  "type": "string"
-                },
-                "addResources": {
-                  "description": "List of resources that are approved to be added, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "tempResources": {
-                  "description": "List of resources that are approved to be temporarily instantiated during the runtime of the lifecycle operation, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "removeResources": {
-                  "description": "List of resources that are approved to be removed, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "updateResources": {
-                  "description": "List of resources that are approved to be modified, with one entry per resource.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type contains information about a Compute, storage or network resource whose addition/update/deletion was granted.\n",
-                    "type": "object",
-                    "required": [
-                      "resourceDefinitionId"
-                    ],
-                    "properties": {
-                      "resourceDefinitionId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "reservationId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "zoneId": {
-                        "description": "An identifier that is unique within a limited local scope other than above listed identifiers, such as within a complex data structure or within a request-response pair. Representation: string of variable length.\n",
-                        "type": "string"
-                      },
-                      "resourceGroupId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "vimAssets": {
-                  "description": "Information about assets for the VNF that are managed by the NFVO in the VIM, such as software images and virtualised compute resource flavours. This attribute is not intended for the modification of vimAssets entries passed earlier. Modification of VIM assets during the lifetime of a VNF instance is not necessary, since it is expected that all applicable assets have been on boarded into the VIM before the VNF is instantiated.\n",
-                  "type": "object",
-                  "properties": {
-                    "computeResourceFlavours": {
-                      "description": "Mappings between virtual compute descriptors defined in the VNFD and compute resource flavours managed in the VIM.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "If the VIM requires the use of virtual compute resource flavours during compute resource instantiation, it is assumed that such flavours are selected or created by the NFVO based on the information in the virtual compute descriptor defined in the VNFD. This type defines the mapping between a virtual compute descriptor in the VNFD and the corresponding compute resource flavour managed by the NFVO in the VIM.\n",
-                        "type": "object",
-                        "required": [
-                          "vnfdVirtualComputeDescId",
-                          "vimFlavourId"
-                        ],
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "vnfdVirtualComputeDescId": {
-                            "description": "An identifier that is unique within a VNF descriptor.\n",
-                            "type": "string"
-                          },
-                          "vimFlavourId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    },
-                    "softwareImages": {
-                      "description": "Mappings between software images defined in the VNFD and software images managed in the VIM.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "This type contains a mapping between a software image definition the VNFD and the corresponding software image managed by the NFVO in the VIM which is needed during compute resource instantiation.\n",
-                        "type": "object",
-                        "required": [
-                          "vnfdSoftwareImageId",
-                          "vimSoftwareImageId"
-                        ],
-                        "properties": {
-                          "vimConnectionId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "resourceProviderId": {
-                            "description": "An identifier with the intention of being globally unique.\n",
-                            "type": "string"
-                          },
-                          "vnfdSoftwareImageId": {
-                            "description": "An identifier that is unique within a VNF descriptor.\n",
-                            "type": "string"
-                          },
-                          "vimSoftwareImageId": {
-                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "extVirtualLinks": {
-                  "description": "Information about external VLs to connect the VNF to. External and/or externally-managed internal VLs can be passed in VNF lifecycle management operation requests such as InstantiateVnf or ChangeVnfFlavor, and/or in the grant response. The NFVO may choose to override in the grant response external and/or externally-managed VL instances that have been passed previously in the associated VNF lifecycle management request, if the lifecycle management request has originated from the NFVO itself.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents an external VL.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "resourceId",
-                      "extCps"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      },
-                      "extCps": {
-                        "description": "External CPs of the VNF to be connected to this external VL.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type represents configuration information for external CPs created from a CPD.\n",
-                          "type": "object",
-                          "required": [
-                            "cpdId"
-                          ],
-                          "properties": {
-                            "cpdId": {
-                              "description": "An identifier that is unique within a VNF descriptor.\n",
-                              "type": "string"
-                            },
-                            "cpConfig": {
-                              "description": "List of instance data that need to be configured on the CP instances created from the respective CPD.\n",
-                              "type": "array",
-                              "items": {
-                                "description": "This type represents an externally provided link port or network address information per instance of an external connection point. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the external VL. In a link port is not provided, the VNFM shall create a link port on the external VL, and use that link port to connect the external CP to the external VL.\n",
-                                "type": "object",
-                                "properties": {
-                                  "cpInstanceId": {
-                                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-                                    "type": "string"
-                                  },
-                                  "linkPortId": {
-                                    "description": "An identifier with the intention of being globally unique.\n",
-                                    "type": "string"
-                                  },
-                                  "cpProtocolData": {
-                                    "description": "Parameters for configuring the network protocols on the link port that connects the CP to a VL.  The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\":  * The \"linkPortId\" and \"cpProtocolData\" attributes shall both be  absent for the deletion of an existing external CP instance\n  addressed by cpInstanceId. \n* At least one of these attributes shall be present for a  to-be-created external CP instance or an existing external\n  CP instance.\n* If the \"linkPortId\" attribute is absent, the VNFM shall create a  link port.\n* If the \"cpProtocolData\" attribute is absent, the \"linkPortId\"  attribute shall be provided referencing a pre-created link port,\n  and the VNFM can use means outside the scope of the present\n  document to obtain the pre-configured address information for the\n  connection point from the resource representing the link port.\n* If both \"cpProtocolData\" and \"linkportId\" are provided, the API  consumer shall ensure that the cpProtocolData can be used with the\n  pre-created link port referenced by \"linkPortId\".\n",
-                                    "type": "array",
-                                    "items": {
-                                      "description": "This type represents network protocol data.\n",
-                                      "type": "object",
-                                      "required": [
-                                        "layerProtocol"
-                                      ],
-                                      "properties": {
-                                        "layerProtocol": {
-                                          "description": "Identifier of layer(s) and protocol(s). This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-                                          "type": "string",
-                                          "enum": [
-                                            "IP_OVER_ETHERNET"
-                                          ]
-                                        },
-                                        "ipOverEthernet": {
-                                          "description": "This type represents network address data for IP over Ethernet.\n",
-                                          "type": "object",
-                                          "properties": {
-                                            "macAddress": {
-                                              "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-                                              "type": "string",
-                                              "format": "MAC"
-                                            },
-                                            "ipAddresses": {
-                                              "description": "List of IP addresses to assign to the CP instance. Each entry represents IP address data for fixed or dynamic IP address assignment per subnet. If this attribute is not present, no IP address shall be assigned.\n",
-                                              "type": "array",
-                                              "items": {
-                                                "type": "object",
-                                                "required": [
-                                                  "type"
-                                                ],
-                                                "properties": {
-                                                  "type": {
-                                                    "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-                                                    "type": "string",
-                                                    "enum": [
-                                                      "IPV4",
-                                                      "IPV6"
-                                                    ]
-                                                  },
-                                                  "fixedAddresses": {
-                                                    "description": "Fixed addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-                                                    "type": "array",
-                                                    "items": {
-                                                      "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                      "type": "string",
-                                                      "format": "IP"
-                                                    }
-                                                  },
-                                                  "numDynamicAddresses": {
-                                                    "description": "Number of dynamic addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-                                                    "type": "integer"
-                                                  },
-                                                  "addressRange": {
-                                                    "description": "An IP address range to be used, e.g. in case of egress connections. In case this attribute is present, IP addresses from the range will be used.\n",
-                                                    "type": "object",
-                                                    "required": [
-                                                      "minAddress",
-                                                      "maxAddress"
-                                                    ],
-                                                    "properties": {
-                                                      "minAddress": {
-                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                        "type": "string",
-                                                        "format": "IP"
-                                                      },
-                                                      "maxAddress": {
-                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-                                                        "type": "string",
-                                                        "format": "IP"
-                                                      }
-                                                    }
-                                                  },
-                                                  "subnetId": {
-                                                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                                                    "type": "string"
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "extLinkPorts": {
-                        "description": "Externally provided link ports to be used to connect external connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "This type represents an externally provided link port to be used to connect an external connection point to an external VL.\n",
-                          "type": "object",
-                          "required": [
-                            "id",
-                            "resourceHandle"
-                          ],
-                          "properties": {
-                            "id": {
-                              "description": "An identifier with the intention of being globally unique.\n",
-                              "type": "string"
-                            },
-                            "resourceHandle": {
-                              "required": [
-                                "vimConnectionId",
-                                "resourceId"
-                              ],
-                              "type": "object",
-                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-                              "properties": {
-                                "vimConnectionId": {
-                                  "description": "An identifier with the intention of being globally unique.\n",
-                                  "type": "string"
-                                },
-                                "resourceProviderId": {
-                                  "description": "An identifier with the intention of being globally unique.\n",
-                                  "type": "string"
-                                },
-                                "resourceId": {
-                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                                  "type": "string"
-                                },
-                                "vimLevelResourceType": {
-                                  "description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-                                  "type": "string"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "extManagedVirtualLinks": {
-                  "description": "Information about internal VLs that are managed by other entities than the VNFM. The indication of externally-managed internal VLs is needed in case networks have been pre-configured for use with certain VNFs, for instance to ensure that these networks have certain properties such as security or acceleration features, or to address particular network topologies. The present document assumes that externally-managed internal VLs are managed by the NFVO and created towards the VIM. External and/or externally-managed internal VLs can be passed in VNF lifecycle management operation requests such as InstantiateVnf or ChangeVnfFlavor, and/or in the grant response. The NFVO may choose to override in the grant response external and/or externally-managed VL instances that have been passed previously in the associated VNF lifecycle management request, if the lifecycle management request has originated from the NFVO itself.\n",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "virtualLinkDescId",
-                      "resourceId"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "virtualLinkDescId": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "vimConnectionId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceProviderId": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      },
-                      "resourceId": {
-                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "additionalParams": {
-                  "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-                  "type": "object"
-                },
-                "_links": {
-                  "description": "Links to resources related to this resource.\n",
-                  "type": "object",
-                  "required": [
-                    "self",
-                    "vnfLcmOpOcc",
-                    "vnfInstance"
-                  ],
-                  "properties": {
-                    "self": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    },
-                    "vnfLcmOpOcc": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    },
-                    "vnfInstance": {
-                      "description": "This type represents a link to a resource.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "URI of the referenced resource.\n",
-                          "type": "string",
-                          "format": "url"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "202": {
-            "description": "Accepted\nThe process of creating the grant is ongoing, no grant is available yet. The response body shall be empty.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            }
-          },
-          "400": {
-            "description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "Forbidden\nThe grant was rejected. A ProblemDetails structure shall be included in the response to provide more details about the rejection in the \"details\" attribute.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "Method Not Allowed\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "Requested Range Not Satisfiable\nThis code is returned if the requested byte range in the Range HTTP header is not present in the requested resource.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Unprocessable Entity\nIf the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem. NOTE 2: This error response code is only applicable for methods that have a request body.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/etsisol003adapter.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/etsisol003adapter.yaml
deleted file mode 100644
index 578708ded8..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-api/src/main/resources/etsisol003adapter.yaml
+++ /dev/null
@@ -1,525 +0,0 @@
-swagger: '2.0'
-info:
-  version: 1.0.0
-  title: ONAP SO VNFM Adapter API
-  description: >-
-    Describes the API between SO (Service Orchestrator) and the adapter for VNFM
-    (Virtual Network Function Manager)
-basePath: /so/vnfm-adapter/v1
-schemes:
-  - http
-  - https
-consumes:
-  - application/json
-produces:
-  - application/json
-paths:
-  '/vnfs/{vnfId}':
-    post:
-      tags:
-        - SO VNFM Adapter
-      summary: VNF create
-      description: Create a VNF instance using a VNFM.
-      operationId: vnf_create
-      consumes:
-        - application/json
-      parameters:
-        - required: true
-          type: string
-          description: >-
-            The identifier of the VNF. This must be the vnf-id of an existing
-            generic-vnf in AAI.
-          name: vnfId
-          in: path
-        - in: body
-          name: body
-          description: VNF creation parameters
-          required: true
-          schema:
-            $ref: '#/definitions/CreateVnfRequest'
-        - name: X-ONAP-RequestID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single top level invocation of ONAP
-          in: header
-          required: true
-          type: string
-        - name: X-InvocationID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single invocation of a single component
-          in: header
-          required: true
-          type: string
-      responses:
-        '202':
-          description: >-
-            The request was accepted for processing, but the processing has not
-            been completed.
-          schema:
-            $ref: '#/definitions/CreateVnfResponse'
-        '400':
-          description: >-
-            An error occurred in the VNFM adapter relating to the given input,
-            for example, if the definition of the given VNF in AAI does not
-            included required information.
-        '404':
-          description: A VNF with the specified ID was not found in AAI.
-        '500':
-          description: >-
-            An error occurred in the VNFM adapter not relating to the given
-            input, or an error is received from the VNFM.
-    delete:
-      tags:
-        - SO VNFM Adapter
-      summary: VNF delete
-      description: Delete an instance of a VNF using a VNFM.
-      operationId: vnf_delete
-      consumes:
-        - application/json
-      parameters:
-        - required: true
-          type: string
-          description: >-
-            The identifier of the VNF. This must be the vnf-id of an existing
-            generic-vnf in AAI
-          name: vnfId
-          in: path
-        - name: X-ONAP-RequestID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single top level invocation of ONAP
-          in: header
-          required: true
-          type: string
-        - name: X-InvocationID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single invocation of a single component
-          in: header
-          required: true
-          type: string
-      responses:
-        '202':
-          description: >-
-            The request was accepted for processing, but the processing has not
-            been completed.
-          schema:
-            $ref: '#/definitions/DeleteVnfResponse'
-        '400':
-          description: >-
-            An error occurred in the VNFM adapter relating to the given input,
-            for example, if the definition of the given VNF in AAI does not
-            included required information.
-        '404':
-          description: A VNF with the specified ID was not found in AAI.
-        '500':
-          description: >-
-            An error occurred in the VNFM adapter not relating to the given
-            input, or an error is received from the VNFM.
-  '/jobs/{jobId}':
-    get:
-      tags:
-        - SO VNFM Adapter
-      summary: Job query
-      description: Query the status of a job.
-      operationId: job_query
-      consumes:
-        - application/json
-      produces:
-        - application/json
-      parameters:
-        - required: true
-          type: string
-          description: The identifier of the Job.
-          name: jobId
-          in: path
-        - name: X-ONAP-RequestID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single top level invocation of ONAP
-          in: header
-          required: true
-          type: string
-        - name: X-InvocationID
-          description: >-
-            Used to track REST requests for logging purposes. Identifies a
-            single invocation of a single component
-          in: header
-          required: true
-          type: string
-      responses:
-        '200':
-          description: ''
-          schema:
-            $ref: '#/definitions/QueryJobResponse'
-        '404':
-          description: A job with the specified ID was not found.
-        '500':
-          description: >-
-            An error occurred in the VNFM adapter not relating to the given
-            input, or an error is received from the VNFM.
-definitions:
-  CreateVnfRequest:
-    type: object
-    properties:
-      name:
-        type: string
-        description: The name to be applied to the VNF.
-      tenant:
-        $ref: '#/definitions/Tenant'
-      pkgId:
-        type: string
-        description: An identifier for the vnf package.
-      additionalParams:
-        type: object
-        description: >-
-          Additional input parameters for the instantiation process, specific to
-          the VNF being instantiated, as declared in the VNFD as part of
-          "InstantiateVnfOpConfig".
-        additionalProperties:
-          type: string
-      externalVirtualLinks:
-        type: array
-        description: Information about external VLs to connect the VNF to.
-        items:
-          $ref: '#/definitions/ExternalVirtualLink'
-    required:
-      - name
-      - tenant
-  Tenant:
-    type: object
-    description: Details of the tenant that VNFs can be deployed into
-    properties:
-      cloudOwner:
-        type: string
-        description: The owner in AAI of the cloud to which the tenant belongs.
-      regionName:
-        type: string
-        description: The regionName in AAI of the cloud to which the tenant belongs.
-      tenantId:
-        type: string
-        description: The identifier of the tenant in the VIM.
-    required:
-      - cloudOwner
-      - regionName
-      - tenantId
-  CreateVnfResponse:
-    type: object
-    properties:
-      jobId:
-        description: The ID of the job which can be used to query the status of the job
-        type: string
-    required:
-      - jobId
-  DeleteVnfResponse:
-    type: object
-    properties:
-      jobId:
-        description: >-
-          The ID of the job which can be used to query the status of the delete
-          job
-        type: string
-    required:
-      - jobId
-  QueryJobResponse:
-    type: object
-    properties:
-      operationStatusRetrievalStatus:
-        $ref: '#/definitions/OperationStatusRetrievalStatusEnum'
-      id:
-        type: string
-      operation:
-        $ref: '#/definitions/OperationEnum'
-      operationState:
-        $ref: '#/definitions/OperationStateEnum'
-      startTime:
-        type: string
-        format: date-time
-      stateEnteredTime:
-        type: string
-        format: date-time
-      vnfInstanceId:
-        type: string
-    required:
-      - operationStatusRetrievalStatus
-  OperationStatusRetrievalStatusEnum:
-    description: The status of the attempt to retrieve the operation from the VNFM
-    type: string
-    enum:
-      - STATUS_FOUND
-      - WAITING_FOR_STATUS
-      - OPERATION_NOT_FOUND
-      - CANNOT_RETRIEVE_STATUS
-  OperationEnum:
-    description: The operation
-    type: string
-    enum:
-      - INSTANTIATE
-      - SCALE
-      - SCALE_TO_LEVEL
-      - CHANGE_FLAVOUR
-      - TERMINATE
-      - HEAL
-      - OPERATE
-      - CHANGE_EXT_CONN
-      - MODIFY_INFO
-  OperationStateEnum:
-    description: The status of the operation
-    type: string
-    enum:
-      - STARTING
-      - PROCESSING
-      - COMPLETED
-      - FAILED_TEMP
-      - FAILED
-      - ROLLING_BACK
-      - ROLLED_BACK
-  ExternalVirtualLink:
-    description: |
-      This type represents an external VL.
-    type: object
-    required:
-      - id
-      - resourceId
-      - extCps
-    properties:
-      id:
-        description: |
-          An identifier with the intention of being globally unique.
-        type: string
-      tenant:
-        $ref: '#/definitions/Tenant'
-      resourceId:
-        description: |
-          An identifier maintained by the VIM.
-        type: string
-      extCps:
-        description: |
-          External CPs of the VNF to be connected to this external VL.
-        type: array
-        items:
-          description: >
-            This type represents configuration information for external CPs
-            created from a CPD.
-          type: object
-          required:
-            - cpdId
-          properties:
-            cpdId:
-              description: |
-                An identifier that is unique within a VNF descriptor.
-              type: string
-            cpConfig:
-              description: >
-                List of instance data that need to be configured on the CP
-                instances created from the respective CPD.
-              type: array
-              items:
-                description: >
-                  This type represents an externally provided link port or
-                  network address information per instance of an external
-                  connection point. In case a link port is provided, the VNFM
-                  shall use that link port when connecting the external CP to
-                  the external VL. In a link port is not provided, the VNFM
-                  shall create a link port on the external VL, and use that link
-                  port to connect the external CP to the external VL.
-                type: object
-                properties:
-                  cpInstanceId:
-                    description: >
-                      An identifier that is unique for the respective type
-                      within a VNF instance, but may not be globally unique.
-                    type: string
-                  linkPortId:
-                    description: |
-                      An identifier with the intention of being globally unique.
-                    type: string
-                  cpProtocolData:
-                    description: >
-                      Parameters for configuring the network protocols on the
-                      link port that connects the CP to a VL.  The following
-                      conditions apply to the attributes "linkPortId" and
-                      "cpProtocolData":  * The "linkPortId" and "cpProtocolData"
-                      attributes shall both be  absent for the deletion of an
-                      existing external CP instance
-                        addressed by cpInstanceId. 
-                      * At least one of these attributes shall be present for a 
-                      to-be-created external CP instance or an existing external
-                        CP instance.
-                      * If the "linkPortId" attribute is absent, the VNFM shall
-                      create a  link port.
-
-                      * If the "cpProtocolData" attribute is absent, the
-                      "linkPortId"  attribute shall be provided referencing a
-                      pre-created link port,
-                        and the VNFM can use means outside the scope of the present
-                        document to obtain the pre-configured address information for the
-                        connection point from the resource representing the link port.
-                      * If both "cpProtocolData" and "linkportId" are provided,
-                      the API  consumer shall ensure that the cpProtocolData can
-                      be used with the
-                        pre-created link port referenced by "linkPortId".
-                    type: array
-                    items:
-                      description: |
-                        This type represents network protocol data.
-                      type: object
-                      required:
-                        - layerProtocol
-                      properties:
-                        layerProtocol:
-                          description: >
-                            Identifier of layer(s) and protocol(s). This
-                            attribute allows to signal the addition of further
-                            types of layer and protocol in future versions of
-                            the present document in a backwards-compatible way.
-                            In the current version of the present document, only
-                            IP over Ethernet is supported.
-                          type: string
-                          enum:
-                            - IP_OVER_ETHERNET
-                        ipOverEthernet:
-                          description: >
-                            This type represents network address data for IP
-                            over Ethernet.
-                          type: object
-                          properties:
-                            macAddress:
-                              description: >
-                                A MAC address. Representation: string that
-                                consists of groups of two hexadecimal digits,
-                                separated by hyphens or colons.
-                              type: string
-                              format: MAC
-                            ipAddresses:
-                              description: >
-                                List of IP addresses to assign to the CP
-                                instance. Each entry represents IP address data
-                                for fixed or dynamic IP address assignment per
-                                subnet. If this attribute is not present, no IP
-                                address shall be assigned.
-                              type: array
-                              items:
-                                type: object
-                                required:
-                                  - type
-                                properties:
-                                  type:
-                                    description: >
-                                      The type of the IP addresses. Permitted
-                                      values: IPV4, IPV6.
-                                    type: string
-                                    enum:
-                                      - IPV4
-                                      - IPV6
-                                  fixedAddresses:
-                                    description: >
-                                      Fixed addresses to assign (from the subnet
-                                      defined by "subnetId" if provided).
-                                      Exactly one of "fixedAddresses",
-                                      "numDynamicAddresses" or "ipAddressRange"
-                                      shall be present.
-                                    type: array
-                                    items:
-                                      description: >
-                                        An IPV4 or IPV6 address. Representation:
-                                        In case of an IPV4 address, string that
-                                        consists of four decimal integers
-                                        separated by dots, each integer ranging
-                                        from 0 to 255. In case of an IPV6
-                                        address, string that  consists of groups
-                                        of zero to four hexadecimal digits,
-                                        separated by colons.
-                                      type: string
-                                      format: IP
-                                  numDynamicAddresses:
-                                    description: >
-                                      Number of dynamic addresses to assign
-                                      (from the subnet defined by "subnetId" if
-                                      provided). Exactly one of
-                                      "fixedAddresses", "numDynamicAddresses" or
-                                      "ipAddressRange" shall be present.
-                                    type: integer
-                                  addressRange:
-                                    description: >
-                                      An IP address range to be used, e.g. in
-                                      case of egress connections. In case this
-                                      attribute is present, IP addresses from
-                                      the range will be used.
-                                    type: object
-                                    required:
-                                      - minAddress
-                                      - maxAddress
-                                    properties:
-                                      minAddress:
-                                        description: >
-                                          An IPV4 or IPV6 address. Representation:
-                                          In case of an IPV4 address, string that
-                                          consists of four decimal integers
-                                          separated by dots, each integer ranging
-                                          from 0 to 255. In case of an IPV6
-                                          address, string that  consists of groups
-                                          of zero to four hexadecimal digits,
-                                          separated by colons.
-                                        type: string
-                                        format: IP
-                                      maxAddress:
-                                        description: >
-                                          An IPV4 or IPV6 address. Representation:
-                                          In case of an IPV4 address, string that
-                                          consists of four decimal integers
-                                          separated by dots, each integer ranging
-                                          from 0 to 255. In case of an IPV6
-                                          address, string that  consists of groups
-                                          of zero to four hexadecimal digits,
-                                          separated by colons.
-                                        type: string
-                                        format: IP
-                                  subnetId:
-                                    description: >
-                                      An identifier maintained by the VIM or
-                                      other resource provider. It is expected to
-                                      be unique within the VIM instance.
-                                    type: string
-      extLinkPorts:
-        description: >
-          Externally provided link ports to be used to connect external
-          connection points to this external VL. If this attribute is not
-          present, the VNFM shall create the link ports on the external VL.
-        type: array
-        items:
-          description: >
-            This type represents an externally provided link port to be used to
-            connect an external connection point to an external VL.
-          type: object
-          required:
-            - id
-            - resourceHandle
-          properties:
-            id:
-              description: |
-                An identifier with the intention of being globally unique.
-              type: string
-            resourceHandle:
-              required:
-                - tenant
-                - resourceId
-              type: object
-              description: >
-                This type represents the information that allows addressing a
-                virtualised resource that is used by a VNF instance.
-              properties:
-                tenant:
-                  $ref: '#/definitions/Tenant'
-                resourceId:
-                  description: >
-                    An identifier maintained by the VIM or other resource
-                    provider. It is expected to be unique within the VIM
-                    instance.
-                  type: string
-                vimLevelResourceType:
-                  description: >
-                    Type of the resource in the scope of the VIM or the resource
-                    provider.
-                  type: string
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/pom.xml
deleted file mode 100644
index b2cb22d60b..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/pom.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-lcm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-lcm-ext-clients</artifactId>
-  <name>ETSI SOL003 Life Cycle Management Adapter Ext Clients</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>${version-swagger-codegen}</version>
-        <executions>
-          <execution>
-            <id>sol003-vnf-lcm-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/SOL003-VNFLifecycleManagement-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/sol003-vnf-lcm</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.lcm.extclients.vnfm.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <jackson>true</jackson>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.basedir}/target/generated-sources/sol003-vnf-lcm/src/gen/java/main</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                    <versionRange>[2.2.0,)</versionRange>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-scalars</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${oltu-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.gsonfire</groupId>
-      <artifactId>gson-fire</artifactId>
-      <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>adapter-rxjava2</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okio</groupId>
-      <artifactId>okio</artifactId>
-      <version>${okio-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-  </dependencies>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/src/main/resources/SOL003-VNFLifecycleManagement-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/src/main/resources/SOL003-VNFLifecycleManagement-API.json
deleted file mode 100644
index 2bc25a2d5b..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-ext-clients/src/main/resources/SOL003-VNFLifecycleManagement-API.json
+++ /dev/null
@@ -1,8143 +0,0 @@
-{
-	"swagger": "2.0",
-	"info": {
-		"version": "1.1.1",
-		"title": "SOL003 - VNF Lifecycle Management interface",
-		"description": "SOL003 - VNF Lifecycle Management interface definition\n\nIMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.\n\nIn clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based filtering mechanism is defined. This mechanism is currently not included in the corresponding OpenAPI design for this GS version. Changes to the attribute-based filtering mechanism are being considered in v2.5.1 of this GS for inclusion in the corresponding future ETSI NFV OpenAPI design.\nPlease report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=\n",
-		"license": {
-			"name": "ETSI Forge copyright notice",
-			"url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
-		}
-	},
-	"externalDocs": {
-		"description": "ETSI GS NFV-SOL 003 V2.4.1",
-		"url": "http://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.04.01_60/gs_NFV-SOL003v020401p.pdf"
-	},
-	"basePath": "/vnflcm/v1",
-	"schemes": ["https"],
-	"consumes": ["application/json"],
-	"produces": ["application/json"],
-	"paths": {
-		"/vnf_instances": {
-			"post": {
-				"description": "Create VNF Identifier\n\nThe POST method creates a new VNF instance resource.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "createVnfRequest",
-						"description": "The VNF creation parameters",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"type": "object",
-							"required": ["vnfdId"],
-							"properties": {
-								"vnfdId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfInstanceName": {
-									"description": "Human-readable name of the VNF instance to be created.\n",
-									"type": "string"
-								},
-								"vnfInstanceDescription": {
-									"description": "Human-readable description of the VNF instance to be created.\n",
-									"type": "string"
-								}
-							}
-						}
-					}, {
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}, {
-						"name": "Content-Type",
-						"description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "A VNF Instance identifier was created successfully",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"Location": {
-								"description": "The resource URI of the created VNF instance",
-								"type": "string",
-								"format": "url"
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a VNF instance.\n",
-							"type": "object",
-							"required": ["id", "vnfdId", "vnfProvider", "vnfProductName", "vnfSoftwareVersion", "vnfdVersion", "vnfPkgId", "instantiationState"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfInstanceName": {
-									"description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfInstanceDescription": {
-									"description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfdId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfProvider": {
-									"description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfProductName": {
-									"description": "Name to identify the VNF Product. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfSoftwareVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfdVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfPkgId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfConfigurableProperties": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"vimConnectionInfo": {
-									"description": "Information about VIM connections to be used for managing the resources for the VNF instance. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. This attribute can be modified with the PATCH method.\n",
-									"type": "array",
-									"items": {
-										"description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-										"type": "object",
-										"required": ["id", "vimType"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimId": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimType": {
-												"description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-												"type": "string"
-											},
-											"interfaceInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"accessInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"extra": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											}
-										}
-									}
-								},
-								"instantiationState": {
-									"description": "The instantiation state of the VNF.\n",
-									"type": "string",
-									"enum": ["NOT_INSTANTIATED", "INSTANTIATED"]
-								},
-								"instantiatedVnfInfo": {
-									"description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
-									"type": "object",
-									"required": ["flavourId", "vnfState"],
-									"properties": {
-										"flavourId": {
-											"description": "An identifier that is unique within a VNF descriptor.\n",
-											"type": "string"
-										},
-										"vnfState": {
-											"type": "string",
-											"enum": ["STARTED", "STOPPED"]
-										},
-										"scaleStatus": {
-											"description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
-											"type": "array",
-											"items": {
-												"required": ["aspectId", "scaleLevel"],
-												"type": "object",
-												"properties": {
-													"aspectId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"scaleLevel": {
-														"description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
-														"type": "integer"
-													}
-												}
-											}
-										},
-										"extCpInfo": {
-											"description": "Information about the external CPs exposed by the VNF instance.\n",
-											"type": "array",
-											"minItems": 1,
-											"items": {
-												"type": "object",
-												"required": ["id", "cpdId"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"cpdId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"cpProtocolInfo": {
-														"description": "Network protocol information for this CP.\n",
-														"type": "array",
-														"items": {
-															"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-															"required": ["layerProtocol"],
-															"properties": {
-																"layerProtocol": {
-																	"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																	"type": "string",
-																	"enum": ["IP_OVER_ETHERNET"]
-																},
-																"ipOverEthernet": {
-																	"description": "This type represents information about a network address that has been assigned.\n",
-																	"type": "object",
-																	"required": ["macAddress"],
-																	"properties": {
-																		"macAddress": {
-																			"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																			"type": "string",
-																			"format": "MAC"
-																		},
-																		"ipAddresses": {
-																			"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["type"],
-																				"properties": {
-																					"type": {
-																						"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																						"type": "string",
-																						"enum": ["IPV4", "IPV6"]
-																					},
-																					"addresses": {
-																						"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																						"type": "array",
-																						"items": {
-																							"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																							"type": "string",
-																							"format": "IP"
-																						}
-																					},
-																					"isDynamic": {
-																						"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																						"type": "boolean"
-																					},
-																					"addressRange": {
-																						"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																						"type": "object",
-																						"required": ["minAddress", "maxAddress"],
-																						"properties": {
-																							"minAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							},
-																							"maxAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							}
-																						}
-																					},
-																					"subnetId": {
-																						"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																						"type": "string",
-																						"format": "IP"
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													},
-													"extLinkPortId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"extVirtualLinkInfo": {
-											"description": "Information about the external VLs the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "resourceHandle"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"resourceHandle": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"extLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"extManagedVirtualLinkInfo": {
-											"description": "External virtual links the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"vnfLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"monitoringParameters": {
-											"description": "Active monitoring parameters.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "value", "timeStamp"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"name": {
-														"description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n",
-														"type": "string"
-													},
-													"value": {
-														"description": "Value of the monitoring parameter known to the VNFM (e.g. obtained for autoscaling purposes). The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures/Objects)) is assumed to be defined in an external measurement specification.\n",
-														"type": "object"
-													},
-													"timeStamp": {
-														"description": "Represents the point in time when the measurement has been performed, as known to the VNFM. Should be formatted according to ETF RFC 3339.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"localizationLanguage": {
-											"description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n",
-											"type": "string"
-										},
-										"vnfcResourceInfo": {
-											"description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vduId", "computeResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vduId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"computeResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"storageResourceIds": {
-														"description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfcCpInfo": {
-														"description": "CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is associated to an external CP of the VNF instance. May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "cpdId"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpdId": {
-																	"description": "An identifier that is unique within a VNF descriptor.\n",
-																	"type": "string"
-																},
-																"vnfExtCpId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpProtocolInfo": {
-																	"description": "Network protocol information for this CP.\n",
-																	"type": "array",
-																	"items": {
-																		"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-																		"required": ["layerProtocol"],
-																		"properties": {
-																			"layerProtocol": {
-																				"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																				"type": "string",
-																				"enum": ["IP_OVER_ETHERNET"]
-																			},
-																			"ipOverEthernet": {
-																				"description": "This type represents information about a network address that has been assigned.\n",
-																				"type": "object",
-																				"required": ["macAddress"],
-																				"properties": {
-																					"macAddress": {
-																						"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																						"type": "string",
-																						"format": "MAC"
-																					},
-																					"ipAddresses": {
-																						"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																						"type": "array",
-																						"items": {
-																							"type": "object",
-																							"required": ["type"],
-																							"properties": {
-																								"type": {
-																									"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																									"type": "string",
-																									"enum": ["IPV4", "IPV6"]
-																								},
-																								"addresses": {
-																									"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																									"type": "array",
-																									"items": {
-																										"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																										"type": "string",
-																										"format": "IP"
-																									}
-																								},
-																								"isDynamic": {
-																									"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																									"type": "boolean"
-																								},
-																								"addressRange": {
-																									"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																									"type": "object",
-																									"required": ["minAddress", "maxAddress"],
-																									"properties": {
-																										"minAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										},
-																										"maxAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										}
-																									}
-																								},
-																								"subnetId": {
-																									"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																									"type": "string",
-																									"format": "IP"
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																},
-																"vnfLinkPortId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualLinkResourceInfo": {
-											"description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId", "networkResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfLinkPorts": {
-														"description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualStorageResourceInfo": {
-											"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "virtualStorageDescId", "storageResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"virtualStorageDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"storageResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										}
-									}
-								},
-								"metadata": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"extensions": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"indicators": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"instantiate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"terminate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scale": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scaleToLevel": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeFlavour": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"heal": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"operate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeExtConn": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nAnother request is in progress that prohibits the fulfilment of the current request, or the current resource state is inconsistent with the request.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"416": {
-						"description": "Requested Range Not Satisfiable\nThis code is returned if the requested byte range in the Range HTTP header is not present in the requested resource.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"422": {
-						"description": "Unprocessable Entity\nIf the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem. NOTE 2: This error response code is only applicable for methods that have a request body.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/vnf_instances/{vnfInstanceId}": {
-			"parameters": [{
-					"name": "vnfInstanceId",
-					"description": "Identifier of the VNF instance. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request creating a new VNF instance resource. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-					"in": "path",
-					"type": "string",
-					"required": true
-				}
-			],
-			"get": {
-				"description": "Query VNF\n\nThe GET method retrieves information about a VNF instance by reading an individual VNF instance resource.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}, {
-						"name": "Content-Type",
-						"description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK\nInformation about zero or more VNF instances was queried successfully. The response body shall contain representations of zero or more VNF instances.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a VNF instance.\n",
-							"type": "object",
-							"required": ["id", "vnfdId", "vnfProvider", "vnfProductName", "vnfSoftwareVersion", "vnfdVersion", "vnfPkgId", "instantiationState"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfInstanceName": {
-									"description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfInstanceDescription": {
-									"description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfdId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfProvider": {
-									"description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfProductName": {
-									"description": "Name to identify the VNF Product. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfSoftwareVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfdVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfPkgId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfConfigurableProperties": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"vimConnectionInfo": {
-									"description": "Information about VIM connections to be used for managing the resources for the VNF instance. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. This attribute can be modified with the PATCH method.\n",
-									"type": "array",
-									"items": {
-										"description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-										"type": "object",
-										"required": ["id", "vimType"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimId": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimType": {
-												"description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-												"type": "string"
-											},
-											"interfaceInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"accessInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"extra": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											}
-										}
-									}
-								},
-								"instantiationState": {
-									"description": "The instantiation state of the VNF.\n",
-									"type": "string",
-									"enum": ["NOT_INSTANTIATED", "INSTANTIATED"]
-								},
-								"instantiatedVnfInfo": {
-									"description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
-									"type": "object",
-									"required": ["flavourId", "vnfState"],
-									"properties": {
-										"flavourId": {
-											"description": "An identifier that is unique within a VNF descriptor.\n",
-											"type": "string"
-										},
-										"vnfState": {
-											"type": "string",
-											"enum": ["STARTED", "STOPPED"]
-										},
-										"scaleStatus": {
-											"description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
-											"type": "array",
-											"items": {
-												"required": ["aspectId", "scaleLevel"],
-												"type": "object",
-												"properties": {
-													"aspectId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"scaleLevel": {
-														"description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
-														"type": "integer"
-													}
-												}
-											}
-										},
-										"extCpInfo": {
-											"description": "Information about the external CPs exposed by the VNF instance.\n",
-											"type": "array",
-											"minItems": 1,
-											"items": {
-												"type": "object",
-												"required": ["id", "cpdId"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"cpdId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"cpProtocolInfo": {
-														"description": "Network protocol information for this CP.\n",
-														"type": "array",
-														"items": {
-															"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-															"required": ["layerProtocol"],
-															"properties": {
-																"layerProtocol": {
-																	"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																	"type": "string",
-																	"enum": ["IP_OVER_ETHERNET"]
-																},
-																"ipOverEthernet": {
-																	"description": "This type represents information about a network address that has been assigned.\n",
-																	"type": "object",
-																	"required": ["macAddress"],
-																	"properties": {
-																		"macAddress": {
-																			"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																			"type": "string",
-																			"format": "MAC"
-																		},
-																		"ipAddresses": {
-																			"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["type"],
-																				"properties": {
-																					"type": {
-																						"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																						"type": "string",
-																						"enum": ["IPV4", "IPV6"]
-																					},
-																					"addresses": {
-																						"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																						"type": "array",
-																						"items": {
-																							"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																							"type": "string",
-																							"format": "IP"
-																						}
-																					},
-																					"isDynamic": {
-																						"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																						"type": "boolean"
-																					},
-																					"addressRange": {
-																						"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																						"type": "object",
-																						"required": ["minAddress", "maxAddress"],
-																						"properties": {
-																							"minAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							},
-																							"maxAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							}
-																						}
-																					},
-																					"subnetId": {
-																						"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																						"type": "string",
-																						"format": "IP"
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													},
-													"extLinkPortId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"extVirtualLinkInfo": {
-											"description": "Information about the external VLs the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "resourceHandle"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"resourceHandle": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"extLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"extManagedVirtualLinkInfo": {
-											"description": "External virtual links the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"vnfLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"monitoringParameters": {
-											"description": "Active monitoring parameters.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "value", "timeStamp"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"name": {
-														"description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n",
-														"type": "string"
-													},
-													"value": {
-														"description": "Value of the monitoring parameter known to the VNFM (e.g. obtained for autoscaling purposes). The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures/Objects)) is assumed to be defined in an external measurement specification.\n",
-														"type": "object"
-													},
-													"timeStamp": {
-														"description": "Represents the point in time when the measurement has been performed, as known to the VNFM. Should be formatted according to ETF RFC 3339.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"localizationLanguage": {
-											"description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n",
-											"type": "string"
-										},
-										"vnfcResourceInfo": {
-											"description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vduId", "computeResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vduId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"computeResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"storageResourceIds": {
-														"description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfcCpInfo": {
-														"description": "CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is associated to an external CP of the VNF instance. May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "cpdId"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpdId": {
-																	"description": "An identifier that is unique within a VNF descriptor.\n",
-																	"type": "string"
-																},
-																"vnfExtCpId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpProtocolInfo": {
-																	"description": "Network protocol information for this CP.\n",
-																	"type": "array",
-																	"items": {
-																		"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-																		"required": ["layerProtocol"],
-																		"properties": {
-																			"layerProtocol": {
-																				"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																				"type": "string",
-																				"enum": ["IP_OVER_ETHERNET"]
-																			},
-																			"ipOverEthernet": {
-																				"description": "This type represents information about a network address that has been assigned.\n",
-																				"type": "object",
-																				"required": ["macAddress"],
-																				"properties": {
-																					"macAddress": {
-																						"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																						"type": "string",
-																						"format": "MAC"
-																					},
-																					"ipAddresses": {
-																						"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																						"type": "array",
-																						"items": {
-																							"type": "object",
-																							"required": ["type"],
-																							"properties": {
-																								"type": {
-																									"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																									"type": "string",
-																									"enum": ["IPV4", "IPV6"]
-																								},
-																								"addresses": {
-																									"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																									"type": "array",
-																									"items": {
-																										"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																										"type": "string",
-																										"format": "IP"
-																									}
-																								},
-																								"isDynamic": {
-																									"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																									"type": "boolean"
-																								},
-																								"addressRange": {
-																									"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																									"type": "object",
-																									"required": ["minAddress", "maxAddress"],
-																									"properties": {
-																										"minAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										},
-																										"maxAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										}
-																									}
-																								},
-																								"subnetId": {
-																									"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																									"type": "string",
-																									"format": "IP"
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																},
-																"vnfLinkPortId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualLinkResourceInfo": {
-											"description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId", "networkResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfLinkPorts": {
-														"description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualStorageResourceInfo": {
-											"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "virtualStorageDescId", "storageResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"virtualStorageDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"storageResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										}
-									}
-								},
-								"metadata": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"extensions": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"indicators": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"instantiate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"terminate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scale": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scaleToLevel": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeFlavour": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"heal": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"operate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeExtConn": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nAnother request is in progress that prohibits the fulfilment of the current request, or the current resource state is inconsistent with the request.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"416": {
-						"description": "Requested Range Not Satisfiable\nThis code is returned if the requested byte range in the Range HTTP header is not present in the requested resource.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Delete VNF Identifier\n\nThis method deletes an individual VNF instance resource.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"204": {
-						"description": "No Content\nThe VNF instance resource and the associated VNF identifier were deleted successfully. The response body shall be empty.\n",
-						"headers": {
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIt fhe request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem. If the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided. If there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nThe operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. Typically, this is due to the fact that the VNF instance resource is in INSTANTIATED state. The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute should convey more information about the error.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"412": {
-						"description": "Precondition Failed\nA precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity. The response body should contain a ProblemDetails structure, in which the \"detail\" attribute should convey more information about the error.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/vnf_instances/{vnfInstanceId}/instantiate": {
-			"parameters": [{
-					"name": "vnfInstanceId",
-					"description": "Identifier of the VNF instance. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request creating a new VNF instance resource. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-					"in": "path",
-					"type": "string",
-					"required": true
-				}
-			],
-			"post": {
-				"description": "Instantiate VNF\n\nThe POST method instantiates a VNF instance.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "InstantiateVnfRequest",
-						"description": "Parameters for the VNF instantiation.",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"type": "object",
-							"required": ["flavourId"],
-							"properties": {
-								"flavourId": {
-									"description": "An identifier that is unique within a VNF descriptor.\n",
-									"type": "string"
-								},
-								"extVirtualLinks": {
-									"description": "Information about external VLs to connect the VNF to.\n",
-									"type": "array",
-									"items": {
-										"description": "This type represents an external VL.\n",
-										"type": "object",
-										"required": ["id", "resourceId", "extCps"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimConnectionId": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"resourceId": {
-												"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-												"type": "string"
-											},
-											"extCps": {
-												"description": "External CPs of the VNF to be connected to this external VL.\n",
-												"type": "array",
-												"items": {
-													"description": "This type represents configuration information for external CPs created from a CPD.\n",
-													"type": "object",
-													"required": ["cpdId"],
-													"properties": {
-														"cpdId": {
-															"description": "An identifier that is unique within a VNF descriptor.\n",
-															"type": "string"
-														},
-														"cpConfig": {
-															"description": "List of instance data that need to be configured on the CP instances created from the respective CPD.\n",
-															"type": "array",
-															"items": {
-																"description": "This type represents an externally provided link port or network address information per instance of an external connection point. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the external VL. In a link port is not provided, the VNFM shall create a link port on the external VL, and use that link port to connect the external CP to the external VL.\n",
-																"type": "object",
-																"properties": {
-																	"cpInstanceId": {
-																		"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																		"type": "string"
-																	},
-																	"linkPortId": {
-																		"description": "An identifier with the intention of being globally unique.\n",
-																		"type": "string"
-																	},
-																	"cpProtocolData": {
-																		"description": "Parameters for configuring the network protocols on the link port that connects the CP to a VL.  The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\":  * The \"linkPortId\" and \"cpProtocolData\" attributes shall both be  absent for the deletion of an existing external CP instance\n  addressed by cpInstanceId. \n* At least one of these attributes shall be present for a  to-be-created external CP instance or an existing external\n  CP instance.\n* If the \"linkPortId\" attribute is absent, the VNFM shall create a  link port.\n* If the \"cpProtocolData\" attribute is absent, the \"linkPortId\"  attribute shall be provided referencing a pre-created link port,\n  and the VNFM can use means outside the scope of the present\n  document to obtain the pre-configured address information for the\n  connection point from the resource representing the link port.\n* If both \"cpProtocolData\" and \"linkportId\" are provided, the API  consumer shall ensure that the cpProtocolData can be used with the\n  pre-created link port referenced by \"linkPortId\".\n",
-																		"type": "array",
-																		"items": {
-																			"description": "This type represents network protocol data.\n",
-																			"type": "object",
-																			"required": ["layerProtocol"],
-																			"properties": {
-																				"layerProtocol": {
-																					"description": "Identifier of layer(s) and protocol(s). This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																					"type": "string",
-																					"enum": ["IP_OVER_ETHERNET"]
-																				},
-																				"ipOverEthernet": {
-																					"description": "This type represents network address data for IP over Ethernet.\n",
-																					"type": "object",
-																					"properties": {
-																						"macAddress": {
-																							"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																							"type": "string",
-																							"format": "MAC"
-																						},
-																						"ipAddresses": {
-																							"description": "List of IP addresses to assign to the CP instance. Each entry represents IP address data for fixed or dynamic IP address assignment per subnet. If this attribute is not present, no IP address shall be assigned.\n",
-																							"type": "array",
-																							"items": {
-																								"type": "object",
-																								"required": ["type"],
-																								"properties": {
-																									"type": {
-																										"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																										"type": "string",
-																										"enum": ["IPV4", "IPV6"]
-																									},
-																									"fixedAddresses": {
-																										"description": "Fixed addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-																										"type": "array",
-																										"items": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										}
-																									},
-																									"numDynamicAddresses": {
-																										"description": "Number of dynamic addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
-																										"type": "integer"
-																									},
-																									"addressRange": {
-																										"description": "An IP address range to be used, e.g. in case of egress connections. In case this attribute is present, IP addresses from the range will be used.\n",
-																										"type": "object",
-																										"required": ["minAddress", "maxAddress"],
-																										"properties": {
-																											"minAddress": {
-																												"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																												"type": "string",
-																												"format": "IP"
-																											},
-																											"maxAddress": {
-																												"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																												"type": "string",
-																												"format": "IP"
-																											}
-																										}
-																									},
-																									"subnetId": {
-																										"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																										"type": "string"
-																									}
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											},
-											"extLinkPorts": {
-												"description": "Externally provided link ports to be used to connect external connection points to this external VL. If this attribute is not present, the VNFM shall create the link ports on the external VL.\n",
-												"type": "array",
-												"items": {
-													"description": "This type represents an externally provided link port to be used to connect an external connection point to an external VL.\n",
-													"type": "object",
-													"required": ["id", "resourceHandle"],
-													"properties": {
-														"id": {
-															"description": "An identifier with the intention of being globally unique.\n",
-															"type": "string"
-														},
-														"resourceHandle": {
-															"required": ["vimConnectionId", "resourceId"],
-															"type": "object",
-															"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-															"properties": {
-																"vimConnectionId": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceId": {
-																	"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																	"type": "string"
-																},
-																"vimLevelResourceType": {
-																	"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}
-								},
-								"vimConnectionInfo": {
-									"description": "Information about VIM connections to be used for managing the resources for the VNF instance, or refer to external / externally-managed virtual links. This attribute shall only be supported and may be present if VNF-related resource management in direct mode is applicable.\n",
-									"type": "array",
-									"items": {
-										"description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-										"type": "object",
-										"required": ["id", "vimType"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimId": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimType": {
-												"description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-												"type": "string"
-											},
-											"interfaceInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"accessInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											}
-										}
-									}
-								},
-								"additionalParams": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								}
-							}
-						}
-					}, {
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}, {
-						"name": "Content-Type",
-						"description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"202": {
-						"description": "Accepted\nThe request was accepted for processing, but the  processing has not been completed. The response body shall be empty. The HTTP response shall include a \"Location\" HTTP header that contains the URI of the newly-created \"VNF LCM operation occurrence\" resource corresponding to the operation.\n",
-						"headers": {
-							"Location": {
-								"description": "The resource URI of the created VNF instance",
-								"type": "string",
-								"format": "url"
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nThe operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. Typically, this is due to the fact that the VNF instance resource is in INSTANTIATED state. The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute should convey more information about the error.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"416": {
-						"description": "Requested Range Not Satisfiable\nThis code is returned if the requested byte range in the Range HTTP header is not present in the requested resource.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/vnf_instances/{vnfInstanceId}/terminate": {
-			"parameters": [{
-					"name": "vnfInstanceId",
-					"description": "The identifier of the VNF instance to be terminated. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request creating a new VNF instance resource. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-					"in": "path",
-					"type": "string",
-					"required": true
-				}
-			],
-			"post": {
-				"description": "Terminate VNF\n\nThe POST method terminates a VNF instance.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "TerminateVnfRequest",
-						"description": "Parameters for the VNF termination.",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"type": "object",
-							"required": ["terminationType"],
-							"properties": {
-								"terminationType": {
-									"description": "Indicates whether forceful or graceful termination is requested. VNFM Adapter will only support FORCEFUL in Dublin.\n",
-									"type": "string",
-									"enum": ["FORCEFUL", "GRACEFUL"]
-								}
-							}
-						}
-					}, {
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}, {
-						"name": "Content-Type",
-						"description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"202": {
-						"description": "Accepted\nThe request was accepted for processing, but the processing has not been completed. On success, the HTTP response shall include a \"Location\" HTTP header that contains the URI of the newly-created \"VNF LCM operation occurrence\" resource corresponding to the operation.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"Location": {
-								"description": "The resource URI of the created VNF instance",
-								"type": "string",
-								"format": "url"
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a VNF instance.\n",
-							"type": "object",
-							"required": ["id", "vnfdId", "vnfProvider", "vnfProductName", "vnfSoftwareVersion", "vnfdVersion", "vnfPkgId", "instantiationState"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfInstanceName": {
-									"description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfInstanceDescription": {
-									"description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n",
-									"type": "string"
-								},
-								"vnfdId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfProvider": {
-									"description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfProductName": {
-									"description": "Name to identify the VNF Product. The value is copied from the VNFD.\n",
-									"type": "string"
-								},
-								"vnfSoftwareVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfdVersion": {
-									"description": "A Version.\n",
-									"type": "string"
-								},
-								"vnfPkgId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"vnfConfigurableProperties": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"vimConnectionInfo": {
-									"description": "Information about VIM connections to be used for managing the resources for the VNF instance. This attribute shall only be supported and present if VNF-related resource management in direct mode is applicable. This attribute can be modified with the PATCH method.\n",
-									"type": "array",
-									"items": {
-										"description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-										"type": "object",
-										"required": ["id", "vimType"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimId": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"vimType": {
-												"description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-												"type": "string"
-											},
-											"interfaceInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"accessInfo": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											},
-											"extra": {
-												"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-												"type": "object"
-											}
-										}
-									}
-								},
-								"instantiationState": {
-									"description": "The instantiation state of the VNF.\n",
-									"type": "string",
-									"enum": ["NOT_INSTANTIATED", "INSTANTIATED"]
-								},
-								"instantiatedVnfInfo": {
-									"description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
-									"type": "object",
-									"required": ["flavourId", "vnfState"],
-									"properties": {
-										"flavourId": {
-											"description": "An identifier that is unique within a VNF descriptor.\n",
-											"type": "string"
-										},
-										"vnfState": {
-											"type": "string",
-											"enum": ["STARTED", "STOPPED"]
-										},
-										"scaleStatus": {
-											"description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
-											"type": "array",
-											"items": {
-												"required": ["aspectId", "scaleLevel"],
-												"type": "object",
-												"properties": {
-													"aspectId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"scaleLevel": {
-														"description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
-														"type": "integer"
-													}
-												}
-											}
-										},
-										"extCpInfo": {
-											"description": "Information about the external CPs exposed by the VNF instance.\n",
-											"type": "array",
-											"minItems": 1,
-											"items": {
-												"type": "object",
-												"required": ["id", "cpdId"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"cpdId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"cpProtocolInfo": {
-														"description": "Network protocol information for this CP.\n",
-														"type": "array",
-														"items": {
-															"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-															"required": ["layerProtocol"],
-															"properties": {
-																"layerProtocol": {
-																	"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																	"type": "string",
-																	"enum": ["IP_OVER_ETHERNET"]
-																},
-																"ipOverEthernet": {
-																	"description": "This type represents information about a network address that has been assigned.\n",
-																	"type": "object",
-																	"required": ["macAddress"],
-																	"properties": {
-																		"macAddress": {
-																			"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																			"type": "string",
-																			"format": "MAC"
-																		},
-																		"ipAddresses": {
-																			"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["type"],
-																				"properties": {
-																					"type": {
-																						"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																						"type": "string",
-																						"enum": ["IPV4", "IPV6"]
-																					},
-																					"addresses": {
-																						"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																						"type": "array",
-																						"items": {
-																							"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																							"type": "string",
-																							"format": "IP"
-																						}
-																					},
-																					"isDynamic": {
-																						"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																						"type": "boolean"
-																					},
-																					"addressRange": {
-																						"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																						"type": "object",
-																						"required": ["minAddress", "maxAddress"],
-																						"properties": {
-																							"minAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							},
-																							"maxAddress": {
-																								"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																								"type": "string",
-																								"format": "IP"
-																							}
-																						}
-																					},
-																					"subnetId": {
-																						"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																						"type": "string",
-																						"format": "IP"
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													},
-													"extLinkPortId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"extVirtualLinkInfo": {
-											"description": "Information about the external VLs the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "resourceHandle"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"resourceHandle": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"extLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"extManagedVirtualLinkInfo": {
-											"description": "External virtual links the VNF instance is connected to.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"vnfLinkPorts": {
-														"description": "Link ports of this VL.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													}
-												}
-											}
-										},
-										"monitoringParameters": {
-											"description": "Active monitoring parameters.\n",
-											"type": "array",
-											"items": {
-												"type": "object",
-												"required": ["id", "value", "timeStamp"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"name": {
-														"description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n",
-														"type": "string"
-													},
-													"value": {
-														"description": "Value of the monitoring parameter known to the VNFM (e.g. obtained for autoscaling purposes). The type of the \"value\" attribute (i.e. scalar, structure (Object in JSON), or array (of scalars, arrays or structures/Objects)) is assumed to be defined in an external measurement specification.\n",
-														"type": "object"
-													},
-													"timeStamp": {
-														"description": "Represents the point in time when the measurement has been performed, as known to the VNFM. Should be formatted according to ETF RFC 3339.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"localizationLanguage": {
-											"description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n",
-											"type": "string"
-										},
-										"vnfcResourceInfo": {
-											"description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vduId", "computeResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vduId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"computeResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"storageResourceIds": {
-														"description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfcCpInfo": {
-														"description": "CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is associated to an external CP of the VNF instance. May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "cpdId"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpdId": {
-																	"description": "An identifier that is unique within a VNF descriptor.\n",
-																	"type": "string"
-																},
-																"vnfExtCpId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"cpProtocolInfo": {
-																	"description": "Network protocol information for this CP.\n",
-																	"type": "array",
-																	"items": {
-																		"description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
-																		"required": ["layerProtocol"],
-																		"properties": {
-																			"layerProtocol": {
-																				"description": "The identifier of layer(s) and protocol(s) associated to the network address information.  Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
-																				"type": "string",
-																				"enum": ["IP_OVER_ETHERNET"]
-																			},
-																			"ipOverEthernet": {
-																				"description": "This type represents information about a network address that has been assigned.\n",
-																				"type": "object",
-																				"required": ["macAddress"],
-																				"properties": {
-																					"macAddress": {
-																						"description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
-																						"type": "string",
-																						"format": "MAC"
-																					},
-																					"ipAddresses": {
-																						"description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet.\n",
-																						"type": "array",
-																						"items": {
-																							"type": "object",
-																							"required": ["type"],
-																							"properties": {
-																								"type": {
-																									"description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
-																									"type": "string",
-																									"enum": ["IPV4", "IPV6"]
-																								},
-																								"addresses": {
-																									"description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided).\n",
-																									"type": "array",
-																									"items": {
-																										"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																										"type": "string",
-																										"format": "IP"
-																									}
-																								},
-																								"isDynamic": {
-																									"description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
-																									"type": "boolean"
-																								},
-																								"addressRange": {
-																									"description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
-																									"type": "object",
-																									"required": ["minAddress", "maxAddress"],
-																									"properties": {
-																										"minAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										},
-																										"maxAddress": {
-																											"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																											"type": "string",
-																											"format": "IP"
-																										}
-																									}
-																								},
-																								"subnetId": {
-																									"description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that  consists of groups of zero to four hexadecimal digits, separated by colons.\n",
-																									"type": "string",
-																									"format": "IP"
-																								}
-																							}
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																},
-																"vnfLinkPortId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualLinkResourceInfo": {
-											"description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "vnfVirtualLinkDescId", "networkResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vnfVirtualLinkDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vnfLinkPorts": {
-														"description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
-														"type": "array",
-														"items": {
-															"type": "object",
-															"required": ["id", "resourceHandle"],
-															"properties": {
-																"id": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																},
-																"resourceHandle": {
-																	"required": ["vimConnectionId", "resourceId"],
-																	"type": "object",
-																	"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-																	"properties": {
-																		"vimConnectionId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceProviderId": {
-																			"description": "An identifier with the intention of being globally unique.\n",
-																			"type": "string"
-																		},
-																		"resourceId": {
-																			"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																			"type": "string"
-																		},
-																		"vimLevelResourceType": {
-																			"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																			"type": "string"
-																		}
-																	}
-																},
-																"cpInstanceId": {
-																	"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-																	"type": "string"
-																}
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"virtualStorageResourceInfo": {
-											"description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
-												"type": "object",
-												"required": ["id", "virtualStorageDescId", "storageResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"virtualStorageDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"storageResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"reservationId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										}
-									}
-								},
-								"metadata": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"extensions": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"indicators": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"instantiate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"terminate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scale": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"scaleToLevel": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeFlavour": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"heal": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"operate": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"changeExtConn": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nThe operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. Typically, this is due to the fact that the VNF instance resource is in NOT-INSTANTIATED state, or that another lifecycle management operation is ongoing. The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute should convey more information about the error.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/vnf_lcm_op_occs/{vnfLcmOpOccId}": {
-			"parameters": [{
-					"name": "vnfLcmOpOccId",
-					"description": "Identifier of a VNF lifecycle management operation occurrence. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a PATCH or POST request triggering a VNF LCM operation. It can also be retrieved from the \"vnfLcmOpOccId\" attribute in the VnfLcmOperationOccurrenceNotification.\n",
-					"in": "path",
-					"required": true,
-					"type": "string"
-				}
-			],
-			"get": {
-				"description": "Get Operation Status\n\nThe client can use this method to retrieve status information about a VNF lifecycle management operation occurrence by reading an individual \"VNF LCM operation occurrence\" resource.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK\nInformation about an individual VNF instance was queried successfully. The response body shall contain status information about a VNF lifecycle management operation occurrence.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a VNF lifecycle management operation occurrence.\n",
-							"type": "object",
-							"required": ["id", "operationState", "stateEnteredTime", "startTime", "vnfInstanceId", "operation", "isAutomaticInvocation", "operationParams", "isCancelPending"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"operationState": {
-									"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-									"type": "string",
-									"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
-								},
-								"stateEnteredTime": {
-									"description": "Date-time when the current state was entered.\n",
-									"type": "string",
-									"format": "date-time"
-								},
-								"startTime": {
-									"description": "Date-time of the start of the operation.\n",
-									"type": "string",
-									"format": "date-time"
-								},
-								"vnfInstanceId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"grantId": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"operation": {
-									"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-									"type": "string",
-									"enum": ["INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO"]
-								},
-								"isAutomaticInvocation": {
-									"description": "Set to true if this VNF LCM operation occurrence has been triggered by an automated procedure inside the VNFM (i.e. ScaleVnf / ScaleVnfToLevel triggered by auto-scale, or HealVnf triggered by auto-heal). Set to false otherwise.\n",
-									"type": "boolean"
-								},
-								"operationParams": {
-									"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-									"type": "object"
-								},
-								"isCancelPending": {
-									"description": "If the VNF LCM operation occurrence is in \"STARTING\", \"PROCESSING\" or \"ROLLING_BACK\" state and the operation is being cancelled, this attribute shall be set to true. Otherwise, it shall be set to false.\n",
-									"type": "boolean"
-								},
-								"cancelMode": {
-									"description": "Cancellation mode. GRACEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation and shall wait for the ongoing resource management operations in the underlying system, typically the VIM, to finish execution or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state. If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and shall wait for the granting request to finish execution or time out. After that, the VNFM shall put the operation occurrence into the ROLLED_BACK state.  FORCEFUL: If the VNF LCM operation occurrence is in \"PROCESSING\" or \"ROLLING_BACK\" state, the VNFM shall not start any new resource management operation, shall cancel the ongoing resource management operations in the underlying system, typically the VIM, and shall wait for the cancellation to finish or to time out. After that, the VNFM shall put the operation occurrence into the FAILED_TEMP state.  If the VNF LCM operation occurrence is in \"STARTING\" state, the VNFM shall not start any resource management operation and put the operation occurrence into the ROLLED_BACK state.\n",
-									"type": "string",
-									"enum": ["GRACEFUL", "FORCEFUL"]
-								},
-								"error": {
-									"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-									"type": "object",
-									"required": ["status", "detail"],
-									"properties": {
-										"type": {
-											"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-											"type": "string",
-											"format": "URI"
-										},
-										"title": {
-											"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-											"type": "string"
-										},
-										"status": {
-											"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-											"type": "integer"
-										},
-										"detail": {
-											"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-											"type": "string"
-										},
-										"instance": {
-											"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-											"type": "string",
-											"format": "URI"
-										}
-									}
-								},
-								"resourceChanges": {
-									"description": "This attribute contains information about the cumulative changes to virtualised resources that were performed so far by the LCM operation since its start, if applicable.\n",
-									"type": "object",
-									"properties": {
-										"affectedVnfcs": {
-											"description": "Information about VNFC instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
-											"type": "array",
-											"items": {
-												"description": "This type provides information about added, deleted, modified and temporary VNFCs.\n",
-												"type": "object",
-												"required": ["id", "vduId", "changeType", "computeResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"vduId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"changeType": {
-														"description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVnfc structure exists as long as the temporary resource exists.\n",
-														"type": "string",
-														"enum": ["ADDED", "REMOVED", "MODIFIED", "TEMPORARY"]
-													},
-													"computeResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													},
-													"affectedVnfcCpIds": {
-														"description": "Identifiers of CP(s) of the VNFC instance that were affected by the change.  Shall be present for those affected CPs of the VNFC instance that are associated to an external CP of the VNF instance. May be present for further affected CPs of the VNFC instance.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													},
-													"addedStorageResourceIds": {
-														"description": "References to VirtualStorage resources that have been added. Each value refers to a VirtualStorageResourceInfo item in the VnfInstance that was added to the VNFC. It shall be provided if at least one storage resource was added to the VNFC.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													},
-													"removedStorageResourceIds": {
-														"description": "References to VirtualStorage resources that have been removed. The value contains the identifier of a VirtualStorageResourceInfo item that has been removed from the VNFC, and might no longer exist in the VnfInstance. It shall be provided if at least one storage resource was removed from the VNFC.\n",
-														"type": "array",
-														"items": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													}
-												}
-											}
-										},
-										"affectedVirtualLinks": {
-											"description": "Information about VL instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
-											"type": "array",
-											"items": {
-												"description": "This type provides information about added, deleted, modified and temporary VLs.\n",
-												"type": "object",
-												"required": ["id", "virtualLinkDescId", "changeType", "networkResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"virtualLinkDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"changeType": {
-														"description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY * LINK_PORT_ADDED * LINK_PORT_REMOVED For a temporary resource, an AffectedVirtualLink structure exists as long as the temporary resource exists.\n",
-														"type": "string",
-														"enum": ["ADDED", "REMOVED", "MODIFIED", "TEMPORARY", "LINK_PORT_ADDED", "LINK_PORT_REMOVED"]
-													},
-													"networkResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"affectedVirtualStorages": {
-											"description": "Information about virtualised storage instances that were affected during the lifecycle operation. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
-											"type": "array",
-											"items": {
-												"description": "This type provides information about added, deleted, modified and temporary virtual storage resources.\n",
-												"type": "object",
-												"required": ["id", "virtualStorageDescId", "changeType", "storageResource"],
-												"properties": {
-													"id": {
-														"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-														"type": "string"
-													},
-													"virtualStorageDescId": {
-														"description": "An identifier that is unique within a VNF descriptor.\n",
-														"type": "string"
-													},
-													"changeType": {
-														"description": "Signals the type of change. Permitted values: * ADDED * REMOVED * MODIFIED * TEMPORARY For a temporary resource, an AffectedVirtualStorage structure exists as long as the temporary resource exists.\n",
-														"type": "string",
-														"enum": ["ADDED", "REMOVED", "MODIFIED", "TEMPORARY"]
-													},
-													"storageResource": {
-														"required": ["vimConnectionId", "resourceId"],
-														"type": "object",
-														"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-														"properties": {
-															"vimConnectionId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceProviderId": {
-																"description": "An identifier with the intention of being globally unique.\n",
-																"type": "string"
-															},
-															"resourceId": {
-																"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																"type": "string"
-															},
-															"vimLevelResourceType": {
-																"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																"type": "string"
-															}
-														}
-													},
-													"metadata": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										}
-									}
-								},
-								"changedInfo": {
-									"description": "This type represents attribute modifications that were performed on an \"Individual VNF instance\" resource. The attributes that can be included consist of those requested to be modified explicitly in the \"VnfInfoModificationRequest\" data structure, and additional attributes of the \"VnfInstance\" data structure that were modified implicitly e.g. when modifying the referenced VNF package.\n",
-									"type": "object",
-									"properties": {
-										"vnfInstanceName": {
-											"description": "If present, this attribute signals modifications of the \"vnfInstanceName\" attribute in \"VnfInstance\".\n",
-											"type": "string"
-										},
-										"vnfInstanceDescription": {
-											"description": "If present, this attribute signals modifications of the \"vnfInstanceDescription\" attribute in \"VnfInstance\".\n",
-											"type": "string"
-										},
-										"vnfConfigurableProperties": {
-											"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-											"type": "object"
-										},
-										"metadata": {
-											"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-											"type": "object"
-										},
-										"extensions": {
-											"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-											"type": "object"
-										},
-										"vimConnectionInfo": {
-											"description": "If present, this attribute signals modifications of certain entries in the \"vimConnectionInfo\" attribute array in \"VnfInstance\".\n",
-											"type": "array",
-											"items": {
-												"description": "This type represents parameters to connect to a VIM for managing the resources of a VNF instance. This structure is used to convey VIM-related parameters over the Or-Vnfm interface. Additional parameters for a VIM may be configured into the VNFM by means outside the scope of the present document, and bound to the identifier of that VIM.\n",
-												"type": "object",
-												"required": ["id", "vimType"],
-												"properties": {
-													"id": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vimId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"vimType": {
-														"description": "Discriminator for the different types of the VIM information. The value of this attribute determines the structure of the \"interfaceInfo\" and \"accessInfo\" attributes, based on the type of the VIM. The set of permitted values is expected to change over time as new types or versions of VIMs become available. The ETSI NFV registry of VIM-related information provides access to information about VimConnectionInfo definitions for various VIM types. The structure of the registry is defined in Annex C of SOL003.\n",
-														"type": "string"
-													},
-													"interfaceInfo": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													},
-													"accessInfo": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													},
-													"extra": {
-														"description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions  defined in clause 4 of IETF RFC 7159.\n",
-														"type": "object"
-													}
-												}
-											}
-										},
-										"vnfPkgId": {
-											"description": "An identifier with the intention of being globally unique.\n",
-											"type": "string"
-										},
-										"vnfdId": {
-											"description": "An identifier with the intention of being globally unique.\n",
-											"type": "string"
-										},
-										"vnfProvider": {
-											"description": "If present, this attribute signals modifications of the \"vnfProvider\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
-											"type": "string"
-										},
-										"vnfProductName": {
-											"description": "If present, this attribute signals modifications of the \"vnfProductName\" attribute in \"VnfInstance\". If present, this attribute (which depends on the value of the \"vnfPkgId\" attribute) was modified implicitly following a request to modify the \"vnfPkgId\" attribute, by copying the value of this attribute from the VNFD in the VNF Package identified by the \"vnfPkgId” attribute.\n",
-											"type": "string"
-										},
-										"vnfSoftwareVersion": {
-											"description": "A Version.\n",
-											"type": "string"
-										},
-										"vnfdVersion": {
-											"description": "A Version.\n",
-											"type": "string"
-										}
-									}
-								},
-								"changedExtConnectivity": {
-									"description": "Information about changed external connectivity, if applicable. This allows the NFVO to obtain the information contained in the latest \"result\" notification if it has not received it due to an error or a wrongly configured subscription filter.\n",
-									"type": "array",
-									"items": {
-										"type": "object",
-										"required": ["id", "resourceHandle"],
-										"properties": {
-											"id": {
-												"description": "An identifier with the intention of being globally unique.\n",
-												"type": "string"
-											},
-											"resourceHandle": {
-												"required": ["vimConnectionId", "resourceId"],
-												"type": "object",
-												"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-												"properties": {
-													"vimConnectionId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"resourceProviderId": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													},
-													"resourceId": {
-														"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-														"type": "string"
-													},
-													"vimLevelResourceType": {
-														"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-														"type": "string"
-													}
-												}
-											},
-											"extLinkPorts": {
-												"description": "Link ports of this VL.\n",
-												"type": "array",
-												"items": {
-													"description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
-													"type": "object",
-													"required": ["id", "resourceHandle"],
-													"properties": {
-														"id": {
-															"description": "An identifier with the intention of being globally unique.\n",
-															"type": "string"
-														},
-														"resourceHandle": {
-															"required": ["vimConnectionId", "resourceId"],
-															"type": "object",
-															"description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
-															"properties": {
-																"vimConnectionId": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceProviderId": {
-																	"description": "An identifier with the intention of being globally unique.\n",
-																	"type": "string"
-																},
-																"resourceId": {
-																	"description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
-																	"type": "string"
-																},
-																"vimLevelResourceType": {
-																	"description": "Type of the resource in the scope of the VIM or the resource provider.\n",
-																	"type": "string"
-																}
-															}
-														},
-														"cpInstanceId": {
-															"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
-															"type": "string"
-														}
-													}
-												}
-											}
-										}
-									}
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self", "vnfInstance"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"vnfInstance": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"grant": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"cancel": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"retry": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"rollback": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										},
-										"fail": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"409": {
-						"description": "Conflict\nAnother request is in progress that prohibits the fulfilment of the current request, or the current resource state is inconsistent with the request.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/subscriptions": {
-			"post": {
-				"description": "Subscribe\n\nThe POST method creates a new subscription. Creation of two subscription resources with the same callbackURI and the same filter can result in performance degradation and will provide duplicates of notifications to the NFVO, and might make sense only in very rare use cases. Consequently, the VNFM may either allow creating a subscription resource if another subscription resource with the same filter and callbackUri already exists (in which case it shall return the “201 Created” response code), or may decide to not create a duplicate subscription resource (in which case it shall return a “303 See Other” response code referencing the existing subscription resource with the same filter and callbackUri).\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "LccnSubscriptionRequest",
-						"description": "Details of the subscription to be created.\n",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"description": "This type represents a subscription request related to notifications about VNF lifecycle changes.\n",
-							"type": "object",
-							"required": ["callbackUri"],
-							"properties": {
-								"filter": {
-									"description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-									"type": "object",
-									"properties": {
-										"vnfInstanceSubscriptionFilter": {
-											"description": "This type represents subscription filter criteria to match VNF instances.\n",
-											"type": "object",
-											"properties": {
-												"vnfInstanceIds": {
-													"description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												}
-											}
-										},
-										"notificationTypes": {
-											"description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-											"type": "array",
-											"items": {
-												"type": "string",
-												"enum": ["VnfLcmOperationOccurrenceNotification", "VnfIdentifierCreationNotification", "VnfIdentifierDeletionNotification"]
-											}
-										},
-										"operationTypes": {
-											"description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-												"type": "string",
-												"enum": ["INSTANTIATE", "TERMINATE"]
-											}
-										},
-										"operationStates": {
-											"description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-												"type": "string",
-												"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
-											}
-										}
-									}
-								},
-								"callbackUri": {
-									"description": "String formatted according to IETF RFC 3986.\n",
-									"type": "string"
-								},
-								"authentication": {
-									"type": "object",
-									"required": ["authType"],
-									"properties": {
-										"authType": {
-											"description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
-											"type": "array",
-											"items": {
-												"type": "string",
-												"enum": ["BASIC", "OAUTH2_CLIENT_CREDENTIALS", "TLS_CERT"]
-											}
-										},
-										"paramsBasic": {
-											"description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-											"type": "object",
-											"properties": {
-												"userName": {
-													"description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-													"type": "string"
-												},
-												"password": {
-													"description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-													"type": "string"
-												}
-											}
-										},
-										"paramsOauth2ClientCredentials": {
-											"description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-											"type": "object",
-											"properties": {
-												"clientId": {
-													"description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-													"type": "string"
-												},
-												"clientPassword": {
-													"description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-													"type": "string"
-												},
-												"tokenEndpoint": {
-													"description": "String formatted according to IETF RFC 3986.\n",
-													"type": "string"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}, {
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}, {
-						"name": "Content-Type",
-						"description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created\nThe subscription was created successfully. The response body shall contain a representation of the created subscription resource. The HTTP response shall include a \"Location\" HTTP header that points to the created subscription resource.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"Location": {
-								"description": "The resource URI of the created VNF instance",
-								"type": "string",
-								"format": "url"
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n",
-							"type": "object",
-							"required": ["id", "callbackUri", "_links"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"filter": {
-									"description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-									"type": "object",
-									"properties": {
-										"vnfInstanceSubscriptionFilter": {
-											"description": "This type represents subscription filter criteria to match VNF instances.\n",
-											"type": "object",
-											"properties": {
-												"vnfdIds": {
-													"description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfProductsFromProviders": {
-													"description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "object",
-														"required": ["vnfProvider"],
-														"properties": {
-															"vnfProvider": {
-																"description": "Name of the VNF provider to match.\n",
-																"type": "string"
-															},
-															"vnfProducts": {
-																"description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
-																"type": "array",
-																"items": {
-																	"type": "object",
-																	"required": ["vnfProductName"],
-																	"properties": {
-																		"vnfProductName": {
-																			"description": "Name of the VNF product to match.\n",
-																			"type": "string"
-																		},
-																		"versions": {
-																			"description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["vnfSoftwareVersion"],
-																				"properties": {
-																					"vnfSoftwareVersion": {
-																						"description": "A version.\n",
-																						"type": "string"
-																					},
-																					"vnfdVersions": {
-																						"description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-																						"type": "array",
-																						"items": {
-																							"description": "A version.\n",
-																							"type": "string"
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												},
-												"vnfInstanceIds": {
-													"description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfInstanceNames": {
-													"description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "string"
-													}
-												}
-											}
-										},
-										"notificationTypes": {
-											"description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-											"type": "array",
-											"items": {
-												"type": "string",
-												"enum": ["VnfLcmOperationOccurrenceNotification", "VnfIdentifierCreationNotification", "VnfIdentifierDeletionNotification"]
-											}
-										},
-										"operationTypes": {
-											"description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-												"type": "string",
-												"enum": ["INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO"]
-											}
-										},
-										"operationStates": {
-											"description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-												"type": "string",
-												"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
-											}
-										}
-									}
-								},
-								"callbackUri": {
-									"description": "String formatted according to IETF RFC 3986.\n",
-									"type": "string"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"303": {
-						"description": "See Other\nA subscription with the same callbackURI and the same filter already exists and the policy of the VNFM is to not create redundant subscriptions. The HTTP response shall include a \"Location\" HTTP header that contains the resource URI of the existing subscription resource. The response body shall be empty.\n",
-						"headers": {
-							"Location": {
-								"description": "The resource URI of the created VNF instance",
-								"type": "string",
-								"format": "url"
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			},
-			"get": {
-				"description": "Query Subscription Information\n\nThe GET method queries the list of active subscriptions of the functional block that invokes the method. It can be used e.g. for resynchronization after error situations.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK\nThe list of subscriptions was queried successfully. The response body shall contain the representations of all active subscriptions of the functional block that invokes the method.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n",
-							"type": "object",
-							"required": ["id", "callbackUri", "_links"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"filter": {
-									"description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-									"type": "object",
-									"properties": {
-										"vnfInstanceSubscriptionFilter": {
-											"description": "This type represents subscription filter criteria to match VNF instances.\n",
-											"type": "object",
-											"properties": {
-												"vnfdIds": {
-													"description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfProductsFromProviders": {
-													"description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "object",
-														"required": ["vnfProvider"],
-														"properties": {
-															"vnfProvider": {
-																"description": "Name of the VNF provider to match.\n",
-																"type": "string"
-															},
-															"vnfProducts": {
-																"description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
-																"type": "array",
-																"items": {
-																	"type": "object",
-																	"required": ["vnfProductName"],
-																	"properties": {
-																		"vnfProductName": {
-																			"description": "Name of the VNF product to match.\n",
-																			"type": "string"
-																		},
-																		"versions": {
-																			"description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["vnfSoftwareVersion"],
-																				"properties": {
-																					"vnfSoftwareVersion": {
-																						"description": "A version.\n",
-																						"type": "string"
-																					},
-																					"vnfdVersions": {
-																						"description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-																						"type": "array",
-																						"items": {
-																							"description": "A version.\n",
-																							"type": "string"
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												},
-												"vnfInstanceIds": {
-													"description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfInstanceNames": {
-													"description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "string"
-													}
-												}
-											}
-										},
-										"notificationTypes": {
-											"description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-											"type": "array",
-											"items": {
-												"type": "string",
-												"enum": ["VnfLcmOperationOccurrenceNotification", "VnfIdentifierCreationNotification", "VnfIdentifierDeletionNotification"]
-											}
-										},
-										"operationTypes": {
-											"description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-												"type": "string",
-												"enum": ["INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO"]
-											}
-										},
-										"operationStates": {
-											"description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-												"type": "string",
-												"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
-											}
-										}
-									}
-								},
-								"callbackUri": {
-									"description": "String formatted according to IETF RFC 3986.\n",
-									"type": "string"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nInvalid attribute-based filtering parameters. The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute should convey more information about the error.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"/subscriptions/{subscriptionId}": {
-			"parameters": [{
-					"name": "subscriptionId",
-					"description": "Identifier of this subscription. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request creating a new subscription resource. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-					"in": "path",
-					"type": "string",
-					"required": true
-				}
-			],
-			"get": {
-				"description": "Query Subscription Information\n\nThe GET method retrieves information about a subscription by reading an individual subscription resource.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Accept",
-						"description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-						"in": "header",
-						"required": true,
-						"type": "string"
-					}, {
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK\nThe operation has completed successfully. The response body shall contain a representation of the subscription resource.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "This type represents a subscription related to notifications about VNF lifecycle changes.\n",
-							"type": "object",
-							"required": ["id", "callbackUri", "_links"],
-							"properties": {
-								"id": {
-									"description": "An identifier with the intention of being globally unique.\n",
-									"type": "string"
-								},
-								"filter": {
-									"description": "This type represents a subscription filter related to notifications about VNF lifecycle changes. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-									"type": "object",
-									"properties": {
-										"vnfInstanceSubscriptionFilter": {
-											"description": "This type represents subscription filter criteria to match VNF instances.\n",
-											"type": "object",
-											"properties": {
-												"vnfdIds": {
-													"description": "If present, match VNF instances that were created based on a VNFD identified by one of the vnfdId values listed in this attribute. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfProductsFromProviders": {
-													"description": "If present, match VNF instances that belong to VNF products from certain providers. The attributes \"vnfdIds\" and \"vnfProductsFromProviders\" are alternatives to reference to VNF instances that are based on certain VNFDs in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "object",
-														"required": ["vnfProvider"],
-														"properties": {
-															"vnfProvider": {
-																"description": "Name of the VNF provider to match.\n",
-																"type": "string"
-															},
-															"vnfProducts": {
-																"description": "If present, match VNF instances that belong to VNF products with certain product names, from one particular provider.\n",
-																"type": "array",
-																"items": {
-																	"type": "object",
-																	"required": ["vnfProductName"],
-																	"properties": {
-																		"vnfProductName": {
-																			"description": "Name of the VNF product to match.\n",
-																			"type": "string"
-																		},
-																		"versions": {
-																			"description": "If present, match VNF instances that belong to VNF products with certain versions and a certain product name, from one particular provider.\n",
-																			"type": "array",
-																			"items": {
-																				"type": "object",
-																				"required": ["vnfSoftwareVersion"],
-																				"properties": {
-																					"vnfSoftwareVersion": {
-																						"description": "A version.\n",
-																						"type": "string"
-																					},
-																					"vnfdVersions": {
-																						"description": "If present, match VNF instances that belong to VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-																						"type": "array",
-																						"items": {
-																							"description": "A version.\n",
-																							"type": "string"
-																						}
-																					}
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												},
-												"vnfInstanceIds": {
-													"description": "If present, match VNF instances with an instance identifier listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"description": "An identifier with the intention of being globally unique.\n",
-														"type": "string"
-													}
-												},
-												"vnfInstanceNames": {
-													"description": "If present, match VNF instances with a VNF Instance Name listed in this attribute. The attributes \"vnfInstanceIds\" and \"vnfInstanceNames\" are alternatives to reference to particular VNF Instances in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-													"type": "array",
-													"items": {
-														"type": "string"
-													}
-												}
-											}
-										},
-										"notificationTypes": {
-											"description": "Match particular notification types. Permitted values: * VnfLcmOperationOccurrenceNotification * VnfIdentifierCreationNotification * VnfIdentifierDeletionNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-											"type": "array",
-											"items": {
-												"type": "string",
-												"enum": ["VnfLcmOperationOccurrenceNotification", "VnfIdentifierCreationNotification", "VnfIdentifierDeletionNotification"]
-											}
-										},
-										"operationTypes": {
-											"description": "Match particular VNF lifecycle operation types for the notification of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ INSTANTIATE | Represents the \"Instantiate VNF\" LCM operation.    SCALE | Represents the \"Scale VNF\" LCM operation. SCALE_TO_LEVEL | Represents the \"Scale VNF to Level\" LCM operation. CHANGE_FLAVOUR | Represents the \"Change VNF Flavour\" LCM operation. TERMINATE | Represents the \"Terminate VNF\" LCM operation. HEAL | Represents the \"Heal VNF\" LCM operation. OPERATE | Represents the \"Operate VNF\" LCM operation. CHANGE_EXT_CONN | Represents the \"Change external VNF connectivity\" LCM operation. MODIFY_INFO | Represents the \"Modify VNF Information\" LCM operation.\n",
-												"type": "string",
-												"enum": ["INSTANTIATE", "SCALE", "SCALE_TO_LEVEL", "CHANGE_FLAVOUR", "TERMINATE", "HEAL", "OPERATE", "CHANGE_EXT_CONN", "MODIFY_INFO"]
-											}
-										},
-										"operationStates": {
-											"description": "Match particular LCM operation state values as reported in notifications of type VnfLcmOperationOccurrenceNotification. May be present if the \"notificationTypes\" attribute contains the value \"VnfLcmOperationOccurrenceNotification\", and shall be absent otherwise.\n",
-											"type": "array",
-											"items": {
-												"description": "Value | Description ------|------------ STARTING | The LCM operation is starting. PROCESSING | The LCM operation is currently in execution. COMPLETED | he LCM operation has been completed successfully. FAILED_TEMP | The LCM operation has failed and execution has stopped, but the execution of the operation is not considered to be closed. FAILED | The LCM operation has failed and it cannot be retried or rolled back, as it is determined that such action won't succeed. ROLLING_BACK | The LCM operation is currently being rolled back. ROLLED_BACK | The LCM operation has been successfully rolled back, i.e. The state of the VNF prior to the original operation invocation has been restored as closely as possible.\n",
-												"type": "string",
-												"enum": ["STARTING", "PROCESSING", "COMPLETED", "FAILED_TEMP", "FAILED", "ROLLING_BACK", "ROLLED_BACK"]
-											}
-										}
-									}
-								},
-								"callbackUri": {
-									"description": "String formatted according to IETF RFC 3986.\n",
-									"type": "string"
-								},
-								"_links": {
-									"description": "Links to resources related to this resource.\n",
-									"type": "object",
-									"required": ["self"],
-									"properties": {
-										"self": {
-											"description": "This type represents a link to a resource.\n",
-											"type": "object",
-											"required": ["href"],
-											"properties": {
-												"href": {
-													"description": "URI of the referenced resource.\n",
-													"type": "string",
-													"format": "url"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Terminate Subscription\n\nThe DELETE method terminates an individual subscription.\n",
-				"tags": ["Sol003VnfLcm"],
-				"parameters": [{
-						"name": "Authorization",
-						"description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-						"in": "header",
-						"required": false,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"204": {
-						"description": "No Content\nThe subscription resource was deleted successfully. The response body shall be empty.\n",
-						"headers": {
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						}
-					},
-					"400": {
-						"description": "Bad Request\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or a syntactically incorrect payload body), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\n ---\n\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n ---\n\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code.The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"401": {
-						"description": "Unauthorized\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							},
-							"WWW-Authenticate": {
-								"description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 0
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"403": {
-						"description": "Forbidden\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided.  It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"404": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  Specifically in case of this task resource, the reason can also be that the task is not supported for the VNF LCM operation occurrence represented by the parent resource, and that the task resource consequently does not exist. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the sourceof the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"405": {
-						"description": "Not Found\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request, or is not willing to disclose that one exists, it shall respond with this response code.  The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"406": {
-						"description": "Not Acceptable\nIf the \"Accept\" HTTP header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted in that case.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"500": {
-						"description": "Internal Server Error\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond withthis response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					},
-					"503": {
-						"description": "Service Unavailable\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 [13] for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-						"headers": {
-							"Content-Type": {
-								"description": "The MIME type of the body of the response.",
-								"type": "string",
-								"maximum": 1,
-								"minimum": 1
-							}
-						},
-						"schema": {
-							"description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-							"type": "object",
-							"required": ["status", "detail"],
-							"properties": {
-								"type": {
-									"description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-									"type": "string",
-									"format": "URI"
-								},
-								"title": {
-									"description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-									"type": "string"
-								},
-								"status": {
-									"description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-									"type": "integer"
-								},
-								"detail": {
-									"description": "A human-readable explanation specific to this occurrence of the problem.\n",
-									"type": "string"
-								},
-								"instance": {
-									"description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-									"type": "string",
-									"format": "URI"
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/pom.xml
deleted file mode 100644
index 6b8f50819f..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-adapter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-lcm</artifactId>
-  <name>ETSI SOL003 Life Cycle Management</name>
-  <packaging>pom</packaging>
-  <modules>
-    <module>etsi-sol003-lcm-api</module>
-    <module>etsi-sol003-lcm-ext-clients</module>
-    <module>etsi-sol003-lcm-adapter</module>
-  </modules>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml
deleted file mode 100644
index 562270407b..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/pom.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-adapter</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <so.log.level>DEBUG</so.log.level>
-          </systemPropertyVariables>
-          <rerunFailingTestsCount>2</rerunFailingTestsCount>
-          <parallel>suites</parallel>
-          <useUnlimitedThreads>false</useUnlimitedThreads>
-          <threadCount>1</threadCount>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-tomcat</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-adapter-common</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-pkgm-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.so.adapters</groupId>
-      <artifactId>etsi-sol003-pkgm-ext-clients</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.inject</groupId>
-      <artifactId>jersey-hk2</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-json-jackson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/ConversionServiceConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/ConversionServiceConfiguration.java
deleted file mode 100644
index fd19d0e0a1..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/ConversionServiceConfiguration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm;
-
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003.PkgChangeNotificationConverter;
-import org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003.PkgOnboardingNotificationConverter;
-import org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003.VnfPkgInfoConverter;
-import org.onap.so.adapters.etsisol003adapter.pkgm.converters.sol003.etsicatalog.PkgmSubscriptionRequestConverter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public class ConversionServiceConfiguration {
-
-    private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
-
-    @Autowired
-    public ConversionServiceConfiguration(final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        this.vnfmAdapterUrlProvider = vnfmAdapterUrlProvider;
-    }
-
-    @Bean
-    public ConversionService conversionService() {
-        final DefaultConversionService service = new DefaultConversionService();
-        service.addConverter(new VnfPkgInfoConverter(vnfmAdapterUrlProvider));
-        service.addConverter(new PkgmSubscriptionRequestConverter());
-        service.addConverter(new PkgChangeNotificationConverter(vnfmAdapterUrlProvider));
-        service.addConverter(new PkgOnboardingNotificationConverter(vnfmAdapterUrlProvider));
-        return service;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/PackageManagementConstants.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/PackageManagementConstants.java
deleted file mode 100644
index 5922aab9ca..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/PackageManagementConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm;
-
-/**
- * ETSI SOL003 VNF Package Management Adapter constants
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-public class PackageManagementConstants {
-
-    public static final String APPLICATION_ZIP = "application/zip";
-
-    /**
-     * Name of the subscription cache
-     */
-    public static final String PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE = "PackageManagementSubscriptionCache";
-
-    private PackageManagementConstants() {}
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/AbstractCacheServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/AbstractCacheServiceProvider.java
deleted file mode 100644
index 6dd67faa9e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/AbstractCacheServiceProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
-
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-
-/**
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-public abstract class AbstractCacheServiceProvider {
-
-    private final CacheManager cacheManager;
-    private final String cacheName;
-
-    public AbstractCacheServiceProvider(final String cacheName, final CacheManager cacheManager) {
-        this.cacheName = cacheName;
-        this.cacheManager = cacheManager;
-    }
-
-    public Cache getCache() {
-        final Cache cache = cacheManager.getCache(cacheName);
-        if (cache == null) {
-            throw new CacheNotFoundException("Unable to find " + cacheName + " cache");
-        }
-        return cache;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheManagerConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheManagerConfiguration.java
deleted file mode 100644
index c184a25bef..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheManagerConfiguration.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
-
-import java.util.Arrays;
-import org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Configuration
-public class CacheManagerConfiguration {
-
-    @Bean
-    public CacheManager cacheManager() {
-        final SimpleCacheManager manager = new SimpleCacheManager();
-        manager.setCaches(Arrays.asList(getCache(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE)));
-
-        return manager;
-    }
-
-    private Cache getCache(final String name) {
-        return new ConcurrentMapCache(name);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheNotFoundException.java
deleted file mode 100644
index 6b2f4710da..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/CacheNotFoundException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
-
-/**
- * Exception for failure to find the cache.
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- *
- */
-public class CacheNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = -372361485260755367L;
-
-    public CacheNotFoundException(final String message) {
-        super(message);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProvider.java
deleted file mode 100644
index 34ed1cfc0c..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
-
-import java.util.Map;
-import java.util.Optional;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-
-/**
- * Interface which provides methods for communicating with the cache
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- *
- */
-public interface PkgmCacheServiceProvider {
-
-    /**
-     * Checks cache if subscription request Id is already present. If not, it adds the subscription to the cache.
-     * 
-     * @param subscriptionId
-     * @param pkgmSubscriptionRequest
-     */
-    void addSubscription(final String subscriptionId, final PkgmSubscriptionRequest pkgmSubscriptionRequest);
-
-    /**
-     * Gets individual subscription from cache
-     * 
-     * @param subscriptionId
-     * @return <AbstractMap.SimpleImmutableEntry<String, PkgmSubscriptionRequest>>
-     */
-    Optional<PkgmSubscriptionRequest> getSubscription(final String subscriptionId);
-
-    /**
-     * Gets Map of subscriptions from cache
-     * 
-     * @return Map<String, PkgmSubscriptionRequest>>
-     */
-    Map<String, PkgmSubscriptionRequest> getSubscriptions();
-
-    /**
-     * Delete subscription from cache
-     * 
-     * @param subscriptionId
-     * @return Boolean
-     */
-    boolean deleteSubscription(final String subscriptionId);
-
-    /**
-     * Checks if subscription exists in cache and return its subscriptionId
-     * 
-     * @param pkgmSubscriptionRequest
-     * @return Subscription Id
-     */
-    Optional<String> getSubscriptionId(final PkgmSubscriptionRequest pkgmSubscriptionRequest);
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProviderImpl.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProviderImpl.java
deleted file mode 100644
index 4811132e92..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/cache/PkgmCacheServiceProviderImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.cache;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation which provides methods for communicating with the cache
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Service
-public class PkgmCacheServiceProviderImpl extends AbstractCacheServiceProvider implements PkgmCacheServiceProvider {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PkgmCacheServiceProviderImpl.class);
-
-    @Autowired
-    public PkgmCacheServiceProviderImpl(final CacheManager cacheManager) {
-        super(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE, cacheManager);
-    }
-
-    @Override
-    public void addSubscription(final String subscriptionId, final PkgmSubscriptionRequest pkgmSubscriptionRequest) {
-        LOGGER.debug("Adding {} to cache with subscription id: {}", pkgmSubscriptionRequest, subscriptionId);
-        getCache().put(subscriptionId, pkgmSubscriptionRequest);
-    }
-
-    @Override
-    public Optional<PkgmSubscriptionRequest> getSubscription(final String subscriptionId) {
-        LOGGER.debug("Getting subscription from cache using Id: {}", subscriptionId);
-        final Cache cache = getCache();
-        final PkgmSubscriptionRequest cacheValue = cache.get(subscriptionId, PkgmSubscriptionRequest.class);
-        if (cacheValue != null) {
-            return Optional.of(cacheValue);
-        }
-        LOGGER.error("Unable to find Subscription in cache using Id: {}", subscriptionId);
-        return Optional.empty();
-    }
-
-    @Override
-    public Map<String, PkgmSubscriptionRequest> getSubscriptions() {
-        LOGGER.info("Getting all subscriptions from cache");
-        final Cache cache = getCache();
-
-        final Object nativeCache = cache.getNativeCache();
-        if (nativeCache instanceof ConcurrentHashMap) {
-            @SuppressWarnings("unchecked")
-            final ConcurrentHashMap<Object, Object> concurrentHashMap = (ConcurrentHashMap<Object, Object>) nativeCache;
-            final Map<String, PkgmSubscriptionRequest> result = new HashMap<>();
-            concurrentHashMap.keySet().forEach(key -> {
-                final Optional<PkgmSubscriptionRequest> optional = getSubscription(key.toString());
-                optional.ifPresent(pkgmSubscriptionRequest -> result.put(key.toString(), pkgmSubscriptionRequest));
-            });
-            return result;
-        }
-        LOGGER.error("Unable to find Subscriptions in cache");
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public boolean deleteSubscription(final String subscriptionId) {
-        final Cache cache = getCache();
-        final Optional<PkgmSubscriptionRequest> optional = getSubscription(subscriptionId);
-        if (optional.isPresent()) {
-            cache.evict(subscriptionId);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public Optional<String> getSubscriptionId(final PkgmSubscriptionRequest pkgmSubscriptionRequest) {
-        final Cache cache = getCache();
-        final Object nativeCache = cache.getNativeCache();
-        if (nativeCache instanceof ConcurrentHashMap) {
-            @SuppressWarnings("unchecked")
-            final ConcurrentHashMap<Object, Object> concurrentHashMap = (ConcurrentHashMap<Object, Object>) nativeCache;
-            final Optional<Entry<Object, Object>> optional = concurrentHashMap.entrySet().stream()
-                    .filter(entry -> entry.getValue().equals(pkgmSubscriptionRequest)).findAny();
-            if (optional.isPresent()) {
-                return Optional.of(optional.get().getKey().toString());
-            }
-        }
-        return Optional.empty();
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/AbstractPkgNotificationConverter.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/AbstractPkgNotificationConverter.java
deleted file mode 100644
index 5f2ee1d5ab..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/AbstractPkgNotificationConverter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003;
-
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgmLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinksVnfPackage;
-
-/**
- * A base class that can be extended by classes for converting Etsi Catalog Manager Pkg Notification classes. Provides
- * common methods that will be useful to those classes.
- *
- * @author andrew.a.lamb@est.tech
- */
-abstract public class AbstractPkgNotificationConverter {
-
-    private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
-
-    public AbstractPkgNotificationConverter(final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        this.vnfmAdapterUrlProvider = vnfmAdapterUrlProvider;
-    }
-
-    protected URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinks convert(
-            final PkgmLinks pkgmLinks, final String vnfPkgId, final String subscriptionId) {
-        final URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinksVnfPackage linksVnfPackage =
-                new URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinksVnfPackage();
-        if (pkgmLinks.getVnfPackage() != null) {
-            linksVnfPackage.setHref(vnfmAdapterUrlProvider.getVnfPackageUrl(vnfPkgId));
-        }
-
-        final URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinksVnfPackage linksSubscription =
-                new URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinksVnfPackage();
-        if (pkgmLinks.getSubscription() != null) {
-            linksSubscription.setHref(vnfmAdapterUrlProvider.getSubscriptionUriString(subscriptionId));
-        }
-
-        final URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinks links =
-                new URIisprovidedbytheclientwhencreatingthesubscriptionVnfPackageOnboardingNotificationLinks();
-        links.setVnfPackage(linksVnfPackage);
-        links.setSubscription(linksSubscription);
-        return links;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgChangeNotificationConverter.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgChangeNotificationConverter.java
deleted file mode 100644
index 5787d35b9a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgChangeNotificationConverter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageChangeNotification;
-import org.slf4j.Logger;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Service;
-
-/**
- * Converter to convert from an Etsi Catalog Manager {@link PkgChangeNotification} Object to its equivalent SOL003
- * {@link VnfPackageChangeNotification} Object
- *
- * @author andrew.a.lamb@est.tech
- */
-@Service
-public class PkgChangeNotificationConverter extends AbstractPkgNotificationConverter
-        implements Converter<PkgChangeNotification, VnfPackageChangeNotification> {
-    private static final Logger logger = getLogger(PkgChangeNotificationConverter.class);
-
-    public PkgChangeNotificationConverter(final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        super(vnfmAdapterUrlProvider);
-    }
-
-    /**
-     * Convert a {@link PkgChangeNotification} Object to an {@link VnfPackageChangeNotification} Object
-     * 
-     * @param pkgChangeNotification The PkgChangeNotification Object to Convert
-     * @return The Converted VnfPackageChangeNotification Object
-     */
-    @Override
-    public VnfPackageChangeNotification convert(final PkgChangeNotification pkgChangeNotification) {
-        logger.info("Converting PkgChangeNotification\n{}", pkgChangeNotification.toString());
-        final VnfPackageChangeNotification vnfPackageChangeNotification = new VnfPackageChangeNotification();
-        vnfPackageChangeNotification.setId(pkgChangeNotification.getId());
-
-        if (pkgChangeNotification.getNotificationType() != null) {
-            vnfPackageChangeNotification.setNotificationType(VnfPackageChangeNotification.NotificationTypeEnum
-                    .fromValue(pkgChangeNotification.getNotificationType().getValue()));
-        }
-
-        vnfPackageChangeNotification.setSubscriptionId(pkgChangeNotification.getSubscriptionId());
-        vnfPackageChangeNotification.setTimeStamp(pkgChangeNotification.getTimeStamp());
-        vnfPackageChangeNotification.setVnfPkgId(pkgChangeNotification.getVnfPkgId());
-
-        vnfPackageChangeNotification.setVnfdId(pkgChangeNotification.getVnfdId());
-
-        if (pkgChangeNotification.getChangeType() != null) {
-            vnfPackageChangeNotification.setChangeType(VnfPackageChangeNotification.ChangeTypeEnum
-                    .fromValue(pkgChangeNotification.getChangeType().getValue()));
-        }
-
-        if (pkgChangeNotification.getOperationalState() != null) {
-            vnfPackageChangeNotification.setOperationalState(VnfPackageChangeNotification.OperationalStateEnum
-                    .fromValue(pkgChangeNotification.getOperationalState().getValue()));
-        }
-
-        vnfPackageChangeNotification.setLinks(convert(pkgChangeNotification.getLinks(),
-                pkgChangeNotification.getVnfPkgId(), pkgChangeNotification.getSubscriptionId()));
-
-        return vnfPackageChangeNotification;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgOnboardingNotificationConverter.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgOnboardingNotificationConverter.java
deleted file mode 100644
index 96a5d827e6..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/PkgOnboardingNotificationConverter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageOnboardingNotification;
-import org.slf4j.Logger;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Service;
-
-/**
- * Converter to convert from an Etsi Catalog Manager {@link PkgOnboardingNotification} Object to its equivalent SOL003
- * {@link VnfPackageOnboardingNotification} Object
- *
- * @author andrew.a.lamb@est.tech
- */
-@Service
-public class PkgOnboardingNotificationConverter extends AbstractPkgNotificationConverter
-        implements Converter<PkgOnboardingNotification, VnfPackageOnboardingNotification> {
-    private static final Logger logger = getLogger(PkgOnboardingNotificationConverter.class);
-
-    public PkgOnboardingNotificationConverter(final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        super(vnfmAdapterUrlProvider);
-    }
-
-
-    /**
-     * Convert a {@link PkgOnboardingNotification} Object to an {@link VnfPackageOnboardingNotification} Object
-     * 
-     * @param pkgOnboardingNotification The PkgOnboardingNotification Object to Convert
-     * @return The Converted VnfPackageOnboardingNotification Object
-     */
-    @Override
-    public VnfPackageOnboardingNotification convert(final PkgOnboardingNotification pkgOnboardingNotification) {
-        logger.info("Converting PkgChangeNotification\n{}", pkgOnboardingNotification.toString());
-        final VnfPackageOnboardingNotification vnfPackageOnboardingNotification =
-                new VnfPackageOnboardingNotification();
-        vnfPackageOnboardingNotification.setId(pkgOnboardingNotification.getId());
-
-        if (pkgOnboardingNotification.getNotificationType() != null) {
-            vnfPackageOnboardingNotification.setNotificationType(VnfPackageOnboardingNotification.NotificationTypeEnum
-                    .fromValue(pkgOnboardingNotification.getNotificationType().getValue()));
-        }
-
-        vnfPackageOnboardingNotification.setSubscriptionId(pkgOnboardingNotification.getSubscriptionId());
-        vnfPackageOnboardingNotification.setTimeStamp(pkgOnboardingNotification.getTimeStamp());
-        vnfPackageOnboardingNotification.setVnfPkgId(pkgOnboardingNotification.getVnfPkgId());
-        vnfPackageOnboardingNotification.setVnfdId(pkgOnboardingNotification.getVnfdId());
-
-        vnfPackageOnboardingNotification.setLinks(convert(pkgOnboardingNotification.getLinks(),
-                pkgOnboardingNotification.getVnfPkgId(), pkgOnboardingNotification.getSubscriptionId()));
-
-        return vnfPackageOnboardingNotification;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/VnfPkgInfoConverter.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/VnfPkgInfoConverter.java
deleted file mode 100644
index 0121cc5885..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/etsicatalog/sol003/VnfPkgInfoConverter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.converters.etsicatalog.sol003;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.Checksum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VNFPKGMLinkSerializer;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPackageArtifactInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPackageSoftwareImageInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPkgInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesAdditionalArtifacts;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesChecksum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesLinksSelf;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesSoftwareImages;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Service;
-
-/**
- * Converter to convert from an Etsi Catalog Manager {@link VnfPkgInfo} Object to its equivalent SOL003 Object
- * {@link InlineResponse2001} Object
- *
- * @author andrew.a.lamb@est.tech
- */
-@Service
-public class VnfPkgInfoConverter implements Converter<VnfPkgInfo, InlineResponse2001> {
-    private static final Logger logger = LoggerFactory.getLogger(VnfPkgInfoConverter.class);
-    private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
-
-    public VnfPkgInfoConverter(final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        this.vnfmAdapterUrlProvider = vnfmAdapterUrlProvider;
-    }
-
-    /**
-     * Convert a {@link VnfPkgInfo} Object to an {@link InlineResponse2001} Object
-     * 
-     * @param vnfPkgInfo The VnfPkgInfo Object to Convert
-     * @return The Converted InlineResponse2001 Object
-     */
-    @Override
-    public InlineResponse2001 convert(final VnfPkgInfo vnfPkgInfo) {
-        if (vnfPkgInfo == null) {
-            logger.error("No VnfPkgInfo Object Provided for Conversion. (Null object received, returning Null)");
-            return null;
-        }
-        final InlineResponse2001 response = new InlineResponse2001();
-        response.setId(vnfPkgInfo.getId());
-        response.setVnfdId(vnfPkgInfo.getVnfdId());
-        response.setVnfProvider(vnfPkgInfo.getVnfProvider());
-        response.setVnfProductName(vnfPkgInfo.getVnfProductName());
-        response.setVnfSoftwareVersion(vnfPkgInfo.getVnfSoftwareVersion());
-        response.setVnfdVersion(vnfPkgInfo.getVnfdVersion());
-        response.setChecksum(convertChecksumToVnfPackagesChecksum(vnfPkgInfo.getChecksum()));
-        response.setSoftwareImages(
-                convertVnfPackageSoftwareImageInfoListToVnfPackagesSoftwareImagesList(vnfPkgInfo.getSoftwareImages()));
-        response.setAdditionalArtifacts(convertVnfPackageArtifactInfoListToVnfPackagesAdditionalArtifactsList(
-                vnfPkgInfo.getAdditionalArtifacts()));
-
-        if (vnfPkgInfo.getOnboardingState() != null) {
-            response.setOnboardingState(
-                    InlineResponse2001.OnboardingStateEnum.fromValue(vnfPkgInfo.getOnboardingState().getValue()));
-        }
-
-        if (vnfPkgInfo.getOperationalState() != null) {
-            response.setOperationalState(
-                    InlineResponse2001.OperationalStateEnum.fromValue(vnfPkgInfo.getOperationalState().getValue()));
-        }
-
-        response.setUserDefinedData((vnfPkgInfo.getUserDefinedData()));
-
-        if (vnfPkgInfo.getLinks() != null) {
-            response.setLinks(getVnfPackagesLinks(vnfPkgInfo.getLinks(), vnfPkgInfo.getId()));
-        }
-
-        return response;
-    }
-
-    private VnfPackagesChecksum convertChecksumToVnfPackagesChecksum(final Checksum checksum) {
-        final VnfPackagesChecksum vnfPackagesChecksum = new VnfPackagesChecksum();
-        if (checksum != null) {
-            vnfPackagesChecksum.setAlgorithm(checksum.getAlgorithm());
-            vnfPackagesChecksum.setHash(checksum.getHash());
-        }
-        return vnfPackagesChecksum;
-    }
-
-    private List<VnfPackagesSoftwareImages> convertVnfPackageSoftwareImageInfoListToVnfPackagesSoftwareImagesList(
-            final List<VnfPackageSoftwareImageInfo> vnfPackageSoftwareImageInfoList) {
-        final List<VnfPackagesSoftwareImages> vnfPackagesSoftwareImages = new ArrayList<>();
-        if (vnfPackageSoftwareImageInfoList != null) {
-            for (final VnfPackageSoftwareImageInfo vnfPackageSoftwareImageInfo : vnfPackageSoftwareImageInfoList) {
-                final VnfPackagesSoftwareImages softwareImage =
-                        convertVnfPackageSoftwareImageInfoToVnfPackagesSoftwareImages(vnfPackageSoftwareImageInfo);
-                vnfPackagesSoftwareImages.add(softwareImage);
-            }
-        }
-        return vnfPackagesSoftwareImages;
-    }
-
-    private VnfPackagesSoftwareImages convertVnfPackageSoftwareImageInfoToVnfPackagesSoftwareImages(
-            final VnfPackageSoftwareImageInfo vnfPackageSoftwareImageInfo) {
-        final VnfPackagesSoftwareImages vnfPackagesSoftwareImages = new VnfPackagesSoftwareImages();
-        vnfPackagesSoftwareImages.setId(vnfPackageSoftwareImageInfo.getId());
-        vnfPackagesSoftwareImages.setName(vnfPackageSoftwareImageInfo.getName());
-        vnfPackagesSoftwareImages.setProvider(vnfPackageSoftwareImageInfo.getProvider());
-        vnfPackagesSoftwareImages.setVersion(vnfPackageSoftwareImageInfo.getVersion());
-        vnfPackagesSoftwareImages
-                .setChecksum(convertChecksumToVnfPackagesChecksum(vnfPackageSoftwareImageInfo.getChecksum()));
-        if (vnfPackageSoftwareImageInfo.getContainerFormat() != null) {
-            vnfPackagesSoftwareImages.setContainerFormat(VnfPackagesSoftwareImages.ContainerFormatEnum
-                    .fromValue(vnfPackageSoftwareImageInfo.getContainerFormat().getValue()));
-        }
-
-        if (vnfPackageSoftwareImageInfo.getDiskFormat() != null) {
-            vnfPackagesSoftwareImages.setDiskFormat(VnfPackagesSoftwareImages.DiskFormatEnum
-                    .fromValue(vnfPackageSoftwareImageInfo.getDiskFormat().getValue()));
-        }
-
-        vnfPackagesSoftwareImages.setCreatedAt(vnfPackageSoftwareImageInfo.getCreatedAt());
-        vnfPackagesSoftwareImages.setMinDisk(vnfPackageSoftwareImageInfo.getMinDisk());
-        vnfPackagesSoftwareImages.setMinRam(vnfPackageSoftwareImageInfo.getMinRam());
-        vnfPackagesSoftwareImages.setSize(vnfPackageSoftwareImageInfo.getSize());
-        vnfPackagesSoftwareImages.setUserMetadata(vnfPackageSoftwareImageInfo.getUserMetadata());
-        vnfPackagesSoftwareImages.setImagePath(vnfPackageSoftwareImageInfo.getImagePath());
-        return vnfPackagesSoftwareImages;
-    }
-
-    private List<VnfPackagesAdditionalArtifacts> convertVnfPackageArtifactInfoListToVnfPackagesAdditionalArtifactsList(
-            final List<VnfPackageArtifactInfo> vnfPackageArtifactInfoList) {
-        if (vnfPackageArtifactInfoList != null) {
-            final List<VnfPackagesAdditionalArtifacts> additionalArtifacts = new ArrayList<>();
-            for (final VnfPackageArtifactInfo artifactInfo : vnfPackageArtifactInfoList) {
-                final VnfPackagesAdditionalArtifacts artifact =
-                        convertVnfPackageArtifactInfoToVnfPackagesAdditionalArtifacts(artifactInfo);
-                additionalArtifacts.add(artifact);
-            }
-            return additionalArtifacts;
-        }
-        return null;
-    }
-
-    private VnfPackagesAdditionalArtifacts convertVnfPackageArtifactInfoToVnfPackagesAdditionalArtifacts(
-            final VnfPackageArtifactInfo vnfPackageArtifactInfo) {
-        final VnfPackagesAdditionalArtifacts vnfPackagesAdditionalArtifacts = new VnfPackagesAdditionalArtifacts();
-        vnfPackagesAdditionalArtifacts.setArtifactPath(vnfPackageArtifactInfo.getArtifactPath());
-        vnfPackagesAdditionalArtifacts
-                .setChecksum(convertChecksumToVnfPackagesChecksum(vnfPackageArtifactInfo.getChecksum()));
-        vnfPackagesAdditionalArtifacts.setMetadata(vnfPackageArtifactInfo.getMetadata());
-        return vnfPackagesAdditionalArtifacts;
-    }
-
-    private VnfPackagesLinks getVnfPackagesLinks(final VNFPKGMLinkSerializer links, final String vnfPkgId) {
-        final VnfPackagesLinks vnfPackagesLinks = new VnfPackagesLinks();
-
-        if (links.getSelf() != null) {
-            vnfPackagesLinks.setSelf(getVnfPackagesLinksSelf(vnfmAdapterUrlProvider.getVnfPackageUrl(vnfPkgId)));
-        }
-
-        if (links.getVnfd() != null) {
-            vnfPackagesLinks.setVnfd(getVnfPackagesLinksSelf(vnfmAdapterUrlProvider.getVnfPackageVnfdUrl(vnfPkgId)));
-        }
-
-        if (links.getPackageContent() != null) {
-            vnfPackagesLinks.setPackageContent(
-                    getVnfPackagesLinksSelf(vnfmAdapterUrlProvider.getVnfPackageContentUrl(vnfPkgId)));
-        }
-
-        return vnfPackagesLinks;
-    }
-
-    private VnfPackagesLinksSelf getVnfPackagesLinksSelf(final String href) {
-        return new VnfPackagesLinksSelf().href(href);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java
deleted file mode 100644
index f63ada9c75..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.converters.sol003.etsicatalog;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.Version;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfProducts;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfProductsProviders;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilter1;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilter1.NotificationTypesEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilter1.OperationalStateEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilter1.UsageStateEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilterVersions;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilterVnfProducts;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilterVnfProductsFromProviders;
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.stereotype.Service;
-
-/**
- * Converter to convert from an Etsi Catalog Manager {@link PkgmSubscriptionRequest} Object to its equivalent ETSI
- * Catalog Manager Object
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Service
-public class PkgmSubscriptionRequestConverter implements
-        Converter<PkgmSubscriptionRequest, org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest> {
-
-    @Override
-    public org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest convert(
-            final PkgmSubscriptionRequest pkgmSubscriptionRequest) {
-        final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest etsiCatalogManagerSubscriptionRequest =
-                new org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest();
-
-        etsiCatalogManagerSubscriptionRequest
-                .setFilter(getPkgmNotificationsFilter(pkgmSubscriptionRequest.getFilter()));
-
-        return etsiCatalogManagerSubscriptionRequest;
-    }
-
-
-    private org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter getPkgmNotificationsFilter(
-            final SubscriptionsFilter1 sol003SubscriptionsFilter) {
-        final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter etsiCatalogManagerFilters =
-                new org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter();
-
-        if (sol003SubscriptionsFilter.getNotificationTypes() != null) {
-            etsiCatalogManagerFilters.setNotificationTypes(
-                    getPkgmNotificationsFilterNotificationTypes(sol003SubscriptionsFilter.getNotificationTypes()));
-        }
-
-        etsiCatalogManagerFilters.setVnfProductsFromProviders(
-                getVnfProductsProviders(sol003SubscriptionsFilter.getVnfProductsFromProviders()));
-
-        etsiCatalogManagerFilters.setVnfdId(getVnfdIds(sol003SubscriptionsFilter.getVnfdId()));
-
-        etsiCatalogManagerFilters.setVnfPkgId(getVnfPkgIds(sol003SubscriptionsFilter.getVnfPkgId()));
-
-        etsiCatalogManagerFilters
-                .setOperationalState(getOperationalState(sol003SubscriptionsFilter.getOperationalState()));
-
-        etsiCatalogManagerFilters.setUsageState(getUsageState(sol003SubscriptionsFilter.getUsageState()));
-
-        return etsiCatalogManagerFilters;
-    }
-
-
-    private List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.UsageStateEnum> getUsageState(
-            final List<UsageStateEnum> usageStates) {
-        if (usageStates != null) {
-            final List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.UsageStateEnum> etsiCatalogUsageStates =
-                    new ArrayList<>();
-            usageStates.stream().forEach(state -> {
-                etsiCatalogUsageStates.add(
-                        org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.UsageStateEnum
-                                .fromValue(state.getValue()));
-            });
-            return etsiCatalogUsageStates;
-        }
-        return Collections.emptyList();
-    }
-
-
-    private List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.OperationalStateEnum> getOperationalState(
-            final List<OperationalStateEnum> operationalStates) {
-        if (operationalStates != null) {
-            final List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.OperationalStateEnum> etsiCatalogOperationalStates =
-                    new ArrayList<>();
-            operationalStates.forEach(state -> {
-                etsiCatalogOperationalStates.add(
-                        org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.OperationalStateEnum
-                                .fromValue(state.getValue()));
-            });
-
-            return etsiCatalogOperationalStates;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<String> getVnfPkgIds(final List<String> vnfPkgId) {
-        if (vnfPkgId != null) {
-            final List<String> etsiCatalogManagerVnfPkgId = new ArrayList<>();
-            vnfPkgId.forEach(type -> {
-                etsiCatalogManagerVnfPkgId.add(type);
-            });
-            return etsiCatalogManagerVnfPkgId;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<String> getVnfdIds(final List<String> vnfdId) {
-        if (vnfdId != null) {
-            final List<String> etsiCatalogManagerVnfdId = new ArrayList<>();
-            vnfdId.forEach(type -> {
-                etsiCatalogManagerVnfdId.add(type);
-            });
-            return etsiCatalogManagerVnfdId;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<VnfProductsProviders> getVnfProductsProviders(
-            final List<SubscriptionsFilterVnfProductsFromProviders> filterProductsFromProvider) {
-
-        if (filterProductsFromProvider != null && !filterProductsFromProvider.isEmpty()) {
-            final List<VnfProductsProviders> etsiCatalogManagerVnfProductsProviders = new ArrayList<>();
-            filterProductsFromProvider.forEach(vnfProduct -> {
-                etsiCatalogManagerVnfProductsProviders
-                        .add(new VnfProductsProviders().vnfProvider(vnfProduct.getVnfProvider())
-                                .vnfProducts(getVnfProducts(vnfProduct.getVnfProducts())));
-            });
-            return etsiCatalogManagerVnfProductsProviders;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<VnfProducts> getVnfProducts(final List<SubscriptionsFilterVnfProducts> sol003VnfProducts) {
-        if (sol003VnfProducts != null) {
-            final List<VnfProducts> etsiCatalogManagerVnfProductsList = new ArrayList<>();
-            sol003VnfProducts.forEach(vnfProduct -> {
-                etsiCatalogManagerVnfProductsList.add(new VnfProducts().vnfProductName(vnfProduct.getVnfProductName())
-                        .versions(getVersion(vnfProduct.getVersions())));
-            });
-            return etsiCatalogManagerVnfProductsList;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<Version> getVersion(final List<SubscriptionsFilterVersions> sol003FilterVersions) {
-        if (sol003FilterVersions != null && !sol003FilterVersions.isEmpty()) {
-            final List<Version> etsiCatalogVersionList = new ArrayList<>();
-            sol003FilterVersions.forEach(vnfFilterVersion -> {
-                etsiCatalogVersionList.add(new Version().vnfSoftwareVersion(vnfFilterVersion.getVnfSoftwareVersion())
-                        .vnfdVersions(vnfFilterVersion.getVnfdVersions()));
-            });
-            return etsiCatalogVersionList;
-        }
-        return Collections.emptyList();
-    }
-
-    private List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.NotificationTypesEnum> getPkgmNotificationsFilterNotificationTypes(
-            final List<NotificationTypesEnum> notificationTypes) {
-
-        if (notificationTypes != null && !notificationTypes.isEmpty()) {
-            final List<org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.NotificationTypesEnum> etsiCatalogNotificationTypes =
-                    new ArrayList<>();
-            notificationTypes.forEach(type -> etsiCatalogNotificationTypes.add(
-                    org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter.NotificationTypesEnum
-                            .fromValue(type.getValue())));
-            return etsiCatalogNotificationTypes;
-        }
-        return Collections.emptyList();
-    }
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogPackageManagementServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogPackageManagementServiceProvider.java
deleted file mode 100644
index db3c24bd1c..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogPackageManagementServiceProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-import java.util.Optional;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2001;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface EtsiCatalogPackageManagementServiceProvider {
-
-    /**
-     * GET Package Content, from VNF Package.
-     * 
-     * @param vnfPkgId The ID of the VNF Package from which the "package_content" will be retrieved.
-     * @return The Package Content of a VNF Package ("vnfPkgId").
-     */
-    Optional<byte[]> getVnfPackageContent(final String vnfPkgId);
-
-    /**
-     * GET VNF packages information from ETSI Catalog. Will return zero or more VNF package representations.
-     *
-     * @return An Array of all VNF packages retrieved from the ETSI Catalog.
-     */
-    Optional<InlineResponse2001[]> getVnfPackages();
-
-    /**
-     * GET specific VNF package information from ETSI Catalog.
-     *
-     * @param vnfPkgId The ID of the VNF Package that you want to query.
-     * @return The VNF package retrieved from the ETSI Catalog
-     */
-    Optional<InlineResponse2001> getVnfPackage(final String vnfPkgId);
-
-    /**
-     * GET specific VNF package VNFD from ETSI Catalog.
-     *
-     * @param vnfPkgId The ID of the VNF Package that you want to query.
-     * @return The VNF package retrieved from the ETSI Catalog
-     */
-    Optional<byte[]> getVnfPackageVnfd(final String vnfPkgId);
-
-    /**
-     * GET Package Artifact, from VNF Package.
-     *
-     * @param vnfPkgId The ID of the VNF Package from which the artifact will be retrieved.
-     * @param artifactPath Sequence of one or more path segments representing the path of the artifact within the VNF
-     *        Package, e.g., foo/bar/run.sh
-     * @return The Package Artifact of a VNF Package ("vnfPkgId", "artifactPath").
-     */
-    Optional<byte[]> getVnfPackageArtifact(final String vnfPkgId, final String artifactPath);
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProvider.java
deleted file mode 100644
index f11fc5c39a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-/**
- * Provides methods for invoking REST calls to the ETSI Catalog Manager.
- * 
- * @author gareth.roper@est.tech
- */
-public interface EtsiCatalogServiceProvider
-        extends EtsiCatalogSubscriptionServiceProvider, EtsiCatalogPackageManagementServiceProvider {
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderConfiguration.java
deleted file mode 100644
index 1ff3672df9..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderConfiguration.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.concurrent.TimeUnit;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.onap.logging.filter.spring.SpringClientPayloadFilter;
-import org.onap.so.adapters.etsi.sol003.adapter.common.configuration.AbstractServiceProviderConfiguration;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.onap.so.configuration.rest.HttpClientConnectionConfiguration;
-import org.onap.so.logging.jaxrs.filter.SOSpringClientFilter;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.onap.so.rest.service.HttpRestServiceProviderImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.http.client.BufferingClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * Configures the HttpRestServiceProvider to make REST calls to the ETSI Catalog Manager
- * 
- * @author gareth.roper@est.tech
- */
-
-@Configuration
-public class EtsiCatalogServiceProviderConfiguration extends AbstractServiceProviderConfiguration {
-
-    public static final String ETSI_CATALOG_REST_TEMPLATE_BEAN = "etsiCatalogRestTemplate";
-
-    public static final String ETSI_CATALOG_SERVICE_PROVIDER_BEAN = "etsiCatalogServiceProvider";
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(EtsiCatalogServiceProviderConfiguration.class);
-
-    private final HttpClientConnectionConfiguration clientConnectionConfiguration;
-
-    @Value("${etsi-catalog-manager.http.client.ssl.trust-store:#{null}}")
-    private Resource trustStore;
-    @Value("${etsi-catalog-manager.http.client.ssl.trust-store-password:#{null}}")
-    private String trustStorePassword;
-
-    @Autowired
-    public EtsiCatalogServiceProviderConfiguration(
-            final HttpClientConnectionConfiguration clientConnectionConfiguration) {
-        this.clientConnectionConfiguration = clientConnectionConfiguration;
-    }
-
-    @Bean
-    @Qualifier(ETSI_CATALOG_REST_TEMPLATE_BEAN)
-    public RestTemplate etsiCatalogRestTemplate() {
-        final RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getInterceptors().add(new SOSpringClientFilter());
-        restTemplate.getInterceptors().add((new SpringClientPayloadFilter()));
-        return restTemplate;
-    }
-
-    @Bean
-    @Qualifier(ETSI_CATALOG_SERVICE_PROVIDER_BEAN)
-    public HttpRestServiceProvider etsiCatalogHttpRestServiceProvider(
-            @Qualifier(ETSI_CATALOG_REST_TEMPLATE_BEAN) final RestTemplate restTemplate) {
-        setGsonMessageConverter(restTemplate);
-
-        final HttpClientBuilder httpClientBuilder = getHttpClientBuilder();
-        if (trustStore != null) {
-            try {
-                LOGGER.debug("Setting up HttpComponentsClientHttpRequestFactory with SSL Context");
-                LOGGER.debug("Setting client trust-store: {}", trustStore.getURL());
-                LOGGER.debug("Creating SSLConnectionSocketFactory with AllowAllHostsVerifier ... ");
-                final SSLContext sslContext = new SSLContextBuilder()
-                        .loadTrustMaterial(trustStore.getURL(), trustStorePassword.toCharArray()).build();
-                final SSLConnectionSocketFactory sslConnectionSocketFactory =
-                        new SSLConnectionSocketFactory(sslContext, AllowAllHostsVerifier.INSTANCE);
-                httpClientBuilder.setSSLSocketFactory(sslConnectionSocketFactory);
-                final Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder
-                        .<ConnectionSocketFactory>create().register("http", PlainConnectionSocketFactory.INSTANCE)
-                        .register("https", sslConnectionSocketFactory).build();
-
-                httpClientBuilder.setConnectionManager(getConnectionManager(socketFactoryRegistry));
-            } catch (final KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
-                    | IOException exception) {
-                LOGGER.error("Error reading truststore, TLS connection will fail.", exception);
-            }
-
-        } else {
-            LOGGER.debug("Setting connection manager without SSL ConnectionSocketFactory ...");
-            httpClientBuilder.setConnectionManager(getConnectionManager());
-        }
-
-        final HttpComponentsClientHttpRequestFactory factory =
-                new HttpComponentsClientHttpRequestFactory(httpClientBuilder.build());
-        restTemplate.setRequestFactory(new BufferingClientHttpRequestFactory(factory));
-
-        return new HttpRestServiceProviderImpl(restTemplate, new BasicHttpHeadersProvider().getHttpHeaders());
-    }
-
-    private PoolingHttpClientConnectionManager getConnectionManager(
-            final Registry<ConnectionSocketFactory> socketFactoryRegistry) {
-        return new PoolingHttpClientConnectionManager(socketFactoryRegistry, null, null, null,
-                clientConnectionConfiguration.getTimeToLiveInMins(), TimeUnit.MINUTES);
-    }
-
-    private PoolingHttpClientConnectionManager getConnectionManager() {
-        return new PoolingHttpClientConnectionManager(clientConnectionConfiguration.getTimeToLiveInMins(),
-                TimeUnit.MINUTES);
-    }
-
-    private HttpClientBuilder getHttpClientBuilder() {
-        return HttpClientBuilder.create().setMaxConnPerRoute(clientConnectionConfiguration.getMaxConnectionsPerRoute())
-                .setMaxConnTotal(clientConnectionConfiguration.getMaxConnections())
-                .setDefaultRequestConfig(getRequestConfig());
-    }
-
-    private RequestConfig getRequestConfig() {
-        return RequestConfig.custom().setSocketTimeout(clientConnectionConfiguration.getSocketTimeOutInMiliSeconds())
-                .setConnectTimeout(clientConnectionConfiguration.getConnectionTimeOutInMilliSeconds()).build();
-    }
-
-    private static final class AllowAllHostsVerifier implements HostnameVerifier {
-
-        private static final AllowAllHostsVerifier INSTANCE = new AllowAllHostsVerifier();
-
-        @Override
-        public boolean verify(final String hostname, final SSLSession session) {
-            LOGGER.debug("Skipping hostname verification ...");
-            return true;
-        }
-
-    }
-
-    @Override
-    protected Gson getGson() {
-        return new JSON().getGson();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderImpl.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderImpl.java
deleted file mode 100644
index a4e5550061..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogServiceProviderImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProviderConfiguration.ETSI_CATALOG_SERVICE_PROVIDER_BEAN;
-import java.util.Optional;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.NsdmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPkgInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.EtsiCatalogManagerBadRequestException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.EtsiCatalogManagerRequestFailureException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.SubscriptionNotFoundException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.VnfPkgBadRequestException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.VnfPkgConflictException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.VnfPkgNotFoundException;
-import org.onap.so.rest.exceptions.HttpResouceNotFoundException;
-import org.onap.so.rest.exceptions.InvalidRestRequestException;
-import org.onap.so.rest.exceptions.RestProcessingException;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-/**
- * Provides the implementations of the REST Requests to the ETSI Catalog Manager.
- * 
- * @author gareth.roper@est.tech
- */
-@Service
-public class EtsiCatalogServiceProviderImpl implements EtsiCatalogServiceProvider {
-    private static final Logger logger = LoggerFactory.getLogger(EtsiCatalogServiceProviderImpl.class);
-
-    private final HttpRestServiceProvider httpServiceProvider;
-    private final EtsiCatalogUrlProvider etsiCatalogUrlProvider;
-    private final ConversionService conversionService;
-
-    @Autowired
-    public EtsiCatalogServiceProviderImpl(final EtsiCatalogUrlProvider etsiCatalogUrlProvider,
-            @Qualifier(ETSI_CATALOG_SERVICE_PROVIDER_BEAN) final HttpRestServiceProvider httpServiceProvider,
-            final ConversionService conversionService) {
-        this.etsiCatalogUrlProvider = etsiCatalogUrlProvider;
-        this.httpServiceProvider = httpServiceProvider;
-        this.conversionService = conversionService;
-    }
-
-    @Override
-    public Optional<byte[]> getVnfPackageContent(final String vnfPkgId)
-            throws EtsiCatalogManagerRequestFailureException {
-        final String vnfRequestUrl = etsiCatalogUrlProvider.getVnfPackageContentUrl(vnfPkgId);
-        final String vnfRequestName = "getVnfPackageContent";
-        return requestVnfElement(vnfPkgId, vnfRequestUrl, vnfRequestName);
-    }
-
-    @Override
-    public Optional<byte[]> getVnfPackageArtifact(final String vnfPkgId, final String artifactPath) {
-        try {
-            final ResponseEntity<byte[]> response = httpServiceProvider.getHttpResponse(
-                    etsiCatalogUrlProvider.getVnfPackageArtifactUrl(vnfPkgId, artifactPath), byte[].class);
-            logger.info("getVnfPackageArtifact Request to ETSI Catalog Manager Status Code: {}",
-                    response.getStatusCodeValue());
-            if (response.getStatusCode().is2xxSuccessful()) {
-                return Optional.ofNullable(response.getBody());
-            }
-        } catch (final HttpResouceNotFoundException httpResouceNotFoundException) {
-            logger.error("Caught HttpResouceNotFoundException", httpResouceNotFoundException);
-            throw new VnfPkgNotFoundException("No Vnf Package Artifact found with vnfPkgId: \"" + vnfPkgId
-                    + "\" and artifactPath: \"" + artifactPath + "\".");
-        } catch (final RestProcessingException restProcessingException) {
-            logger.error("Caught RestProcessingException with Status Code: {}", restProcessingException.getStatusCode(),
-                    restProcessingException);
-            if (restProcessingException.getStatusCode() == HttpStatus.CONFLICT.value()) {
-                throw new VnfPkgConflictException("A conflict occurred with the state of the resource,\n"
-                        + "due to the attribute: onboardingState not being set to ONBOARDED.");
-            }
-        }
-        throw new EtsiCatalogManagerRequestFailureException("Internal Server Error Occurred.");
-    }
-
-    @Override
-    public Optional<InlineResponse2001[]> getVnfPackages() {
-        try {
-            final ResponseEntity<VnfPkgInfo[]> response =
-                    httpServiceProvider.getHttpResponse(etsiCatalogUrlProvider.getVnfPackagesUrl(), VnfPkgInfo[].class);
-            logger.info("getVnfPackages Request to ETSI Catalog Manager Status Code: {}",
-                    response.getStatusCodeValue());
-            if (response.getStatusCode().is2xxSuccessful()) {
-                if (response.hasBody()) {
-                    final VnfPkgInfo[] vnfPackages = response.getBody();
-                    assert (vnfPackages != null);
-                    final InlineResponse2001[] responses = new InlineResponse2001[vnfPackages.length];
-                    for (int index = 0; index < vnfPackages.length; index++) {
-                        if (conversionService.canConvert(vnfPackages[index].getClass(), InlineResponse2001.class)) {
-                            final InlineResponse2001 inlineResponse2001 =
-                                    conversionService.convert(vnfPackages[index], InlineResponse2001.class);
-                            if (inlineResponse2001 != null) {
-                                responses[index] = inlineResponse2001;
-                            }
-                        } else {
-                            logger.error("Unable to find Converter for response class: {}",
-                                    vnfPackages[index].getClass());
-                        }
-                    }
-                    return Optional.of(responses);
-                }
-                logger.error("Received response without body ...");
-            }
-            logger.error("Unexpected status code received {}", response.getStatusCode());
-            return Optional.empty();
-        } catch (final InvalidRestRequestException invalidRestRequestException) {
-            logger.error("Caught InvalidRestRequestException", invalidRestRequestException);
-            throw new VnfPkgBadRequestException("Error: Bad Request Received");
-        } catch (final HttpResouceNotFoundException httpResouceNotFoundException) {
-            logger.error("Caught HttpResouceNotFoundException", httpResouceNotFoundException);
-            throw new VnfPkgNotFoundException("No Vnf Packages found");
-        } catch (final RestProcessingException restProcessingException) {
-            logger.error("Caught RestProcessingException with Status Code: {}", restProcessingException.getStatusCode(),
-                    restProcessingException);
-            throw new EtsiCatalogManagerRequestFailureException("Internal Server Error Occurred.");
-        }
-    }
-
-    @Override
-    public Optional<InlineResponse2001> getVnfPackage(final String vnfPkgId) {
-        try {
-            final ResponseEntity<VnfPkgInfo> response = httpServiceProvider
-                    .getHttpResponse(etsiCatalogUrlProvider.getVnfPackageUrl(vnfPkgId), VnfPkgInfo.class);
-            logger.info("getVnfPackage Request for vnfPkgId {} to ETSI Catalog Manager Status Code: {}", vnfPkgId,
-                    response.getStatusCodeValue());
-            if (response.getStatusCode().is2xxSuccessful()) {
-                if (response.hasBody()) {
-                    final VnfPkgInfo vnfPkgInfo = response.getBody();
-                    if (conversionService.canConvert(vnfPkgInfo.getClass(), InlineResponse2001.class)) {
-                        return Optional.ofNullable(conversionService.convert(vnfPkgInfo, InlineResponse2001.class));
-                    }
-                    logger.error("Unable to find Converter for response class: {}", vnfPkgInfo.getClass());
-                }
-                logger.error("Received response without body ....");
-            }
-            return Optional.empty();
-        } catch (final InvalidRestRequestException invalidRestRequestException) {
-            logger.error("Caught InvalidRestRequestException", invalidRestRequestException);
-            throw new VnfPkgBadRequestException("Error: Bad Request Received");
-        } catch (final HttpResouceNotFoundException httpResouceNotFoundException) {
-            logger.error("Caught HttpResouceNotFoundException", httpResouceNotFoundException);
-            throw new VnfPkgNotFoundException("No Vnf Package found with vnfPkgId: " + vnfPkgId);
-        } catch (final RestProcessingException restProcessingException) {
-            logger.error("Caught RestProcessingException with Status Code: {}", restProcessingException.getStatusCode(),
-                    restProcessingException);
-            throw new EtsiCatalogManagerRequestFailureException("Internal Server Error Occurred.");
-        }
-    }
-
-    @Override
-    public Optional<byte[]> getVnfPackageVnfd(final String vnfPkgId) {
-        final String vnfRequestUrl = etsiCatalogUrlProvider.getVnfPackageVnfdUrl(vnfPkgId);
-        final String vnfRequestName = "getVnfPackageVnfd";
-        return requestVnfElement(vnfPkgId, vnfRequestUrl, vnfRequestName);
-    }
-
-    @Override
-    public Optional<PkgmSubscription> postSubscription(
-            final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest etsiCatalogManagerSubscriptionRequest) {
-        try {
-            final ResponseEntity<PkgmSubscription> responseEntity =
-                    httpServiceProvider.postHttpRequest(etsiCatalogManagerSubscriptionRequest,
-                            etsiCatalogUrlProvider.getSubscriptionUrl(), PkgmSubscription.class);
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                if (responseEntity.hasBody()) {
-                    return Optional.of(responseEntity.getBody());
-                }
-                logger.error("Received response without body on postSubscription");
-            }
-            logger.error("Unexpected Status Code Received on postSubscription: {}", responseEntity.getStatusCode());
-            return Optional.empty();
-        } catch (final InvalidRestRequestException invalidRestRequestException) {
-            logger.error("Caught InvalidRestRequestException", invalidRestRequestException);
-            throw new EtsiCatalogManagerBadRequestException(
-                    "Bad Request Received on postSubscription call to ETSI Catalog Manager.");
-        } catch (final RestProcessingException restProcessingException) {
-            logger.error("Caught RestProcessingException with Status Code: {}", restProcessingException.getStatusCode(),
-                    restProcessingException);
-            throw new EtsiCatalogManagerRequestFailureException(
-                    "Internal Server Error Occurred. On postSubscription with StatusCode: "
-                            + restProcessingException.getStatusCode());
-        }
-    }
-
-    @Override
-    public boolean deleteSubscription(final String subscriptionId) {
-        try {
-            final ResponseEntity<Void> responseEntity = httpServiceProvider
-                    .deleteHttpRequest(etsiCatalogUrlProvider.getSubscriptionUrl() + "/" + subscriptionId, Void.class);
-
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                logger.info("Subscription with ID: {} has been successfully deleted from the ETSI Catalog Manager",
-                        subscriptionId);
-                return true;
-            }
-            logger.error("Unexpected Status Code Received on deleteSubscription: {}", responseEntity.getStatusCode());
-            return false;
-        } catch (final HttpResouceNotFoundException resouceNotFoundException) {
-            final String message = "Unable to find subscription in ETSI Catalog Manager using id: " + subscriptionId;
-            logger.error(message);
-            throw new SubscriptionNotFoundException(message);
-        } catch (final InvalidRestRequestException invalidRestRequestException) {
-            logger.error("Caught InvalidRestRequestException on deleteSubscription call to ETSI Catalog Manager.",
-                    invalidRestRequestException);
-            throw new EtsiCatalogManagerBadRequestException(
-                    "Bad Request Received on deleteSubscription call to ETSI Catalog Manager.");
-        }
-    }
-
-    @Override
-    public Optional<NsdmSubscription> getSubscription(final String subscriptionId) {
-        try {
-            final ResponseEntity<NsdmSubscription> responseEntity = httpServiceProvider.getHttpResponse(
-                    etsiCatalogUrlProvider.getSubscriptionUrl() + "/" + subscriptionId, NsdmSubscription.class);
-
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                logger.debug("Found subscription with ID: {} in ETSI Catalog Manager", subscriptionId);
-                return Optional.ofNullable(responseEntity.getBody());
-            }
-            logger.error("Unexpected Status Code Received on getting subscription from ETSI Catalog Manager: {}",
-                    responseEntity.getStatusCode());
-        } catch (final HttpResouceNotFoundException resouceNotFoundException) {
-            logger.error("Unable to find subscription in ETSI Catalog Manager using id: {}", subscriptionId);
-            return Optional.empty();
-        } catch (final RestProcessingException | InvalidRestRequestException exception) {
-            logger.error("Unable to query ETSI Catalog Manager for subscription using id: {}", subscriptionId,
-                    exception);
-        }
-        throw new EtsiCatalogManagerRequestFailureException("Internal Server Error Occurred.");
-    }
-
-    private Optional<byte[]> requestVnfElement(final String vnfPkgId, final String vnfRequestUrl,
-            final String vnfRequestName) {
-        try {
-            final ResponseEntity<byte[]> response = httpServiceProvider.getHttpResponse(vnfRequestUrl, byte[].class);
-            logger.info("{} Request to ETSI Catalog Manager Status Code: {}", vnfRequestName,
-                    response.getStatusCodeValue());
-            if (response.getStatusCode() == HttpStatus.OK) {
-                return Optional.ofNullable(response.getBody());
-            }
-        } catch (final HttpResouceNotFoundException httpResouceNotFoundException) {
-            logger.error("Caught HttpResouceNotFoundException", httpResouceNotFoundException);
-            throw new VnfPkgNotFoundException("No Vnf Package found with vnfPkgId: " + vnfPkgId);
-        } catch (final RestProcessingException restProcessingException) {
-            logger.error("Caught RestProcessingException with Status Code: {}", restProcessingException.getStatusCode(),
-                    restProcessingException);
-            if (restProcessingException.getStatusCode() == HttpStatus.CONFLICT.value()) {
-                throw new VnfPkgConflictException("A conflict occurred with the state of the resource,\n"
-                        + "due to the attribute: onboardingState not being set to ONBOARDED.");
-            }
-        }
-        throw new EtsiCatalogManagerRequestFailureException("Internal Server Error Occurred.");
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogSubscriptionServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogSubscriptionServiceProvider.java
deleted file mode 100644
index d561f8734b..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogSubscriptionServiceProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-import java.util.Optional;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.NsdmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscription;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-public interface EtsiCatalogSubscriptionServiceProvider {
-
-    /**
-     * POST the SubscriptionRequest Object.
-     *
-     * @return The ETSI Catalog Manager's PkgmSubscription object.
-     */
-    Optional<PkgmSubscription> postSubscription(
-            final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest etsiCatalogManagerSubscriptionRequest);
-
-    /**
-     * Get the Subscription from ETSI Catalog.
-     * 
-     * @param subscriptionId Subscription ID
-     * @return The Subscription {@link NsdmSubscription} from ETSI Catalog
-     */
-    Optional<NsdmSubscription> getSubscription(final String subscriptionId);
-
-    /**
-     * DELETE the SubscriptionRequest Object.
-     *
-     * @return A Boolean representing if the delete was successful or not.
-     */
-    boolean deleteSubscription(final String subscriptionId);
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogUrlProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogUrlProvider.java
deleted file mode 100644
index 1725bf9fba..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/etsicatalog/EtsiCatalogUrlProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-/**
- * Provides the URLs for the REST Requests to the ETSI Catalog Manager.
- * 
- * @author gareth.roper@est.tech
- */
-@Service
-public class EtsiCatalogUrlProvider {
-
-    private static final Logger logger = getLogger(EtsiCatalogUrlProvider.class);
-
-    @Value("${etsi-catalog-manager.vnfpkgm.endpoint}")
-    private String etsiCatalogManagerEndpoint;
-
-    public EtsiCatalogUrlProvider() {}
-
-    /**
-     * Get the URL for retrieving the Package Content from the ETSI Catalog.".
-     *
-     * @param vnfPkgId The ID of the VNF Package
-     * @return the URL for the GET operation
-     */
-    public String getVnfPackageContentUrl(final String vnfPkgId) {
-        final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/package_content";
-        logger.info("getEtsiCatalogVnfPackageContentUrl: {}", url);
-        return url;
-    }
-
-    /**
-     * Get the URL for retrieving VNF packages information from ETSI Catalog.".
-     *
-     * @return the URL for the GET operation
-     */
-    public String getVnfPackagesUrl() {
-        final String url = etsiCatalogManagerEndpoint + "/vnf_packages";
-        logger.info("getEtsiCatalogVnfPackagesEndpoint: {}", url);
-        return url;
-    }
-
-    /**
-     * Get the URL for retrieving specific VNF package information from the ETSI Catalog.".
-     *
-     * @param vnfPkgId The ID of the VNF Package
-     * @return the URL for the GET operation
-     */
-    public String getVnfPackageUrl(final String vnfPkgId) {
-        final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId;
-        logger.info("getEtsiCatalogVnfPackageEndpoint: {}", url);
-        return url;
-    }
-
-    /**
-     * Get the URL for retrieving VNF Package Artifacts
-     *
-     * @param vnfPkgId The ID of the VNF Package
-     * @param artifactPath The path to the Artifact
-     * @return the URL for the GET operation
-     */
-    public String getVnfPackageArtifactUrl(final String vnfPkgId, final String artifactPath) {
-        final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/artifacts/" + artifactPath;
-        logger.info("getVnfPackageArtifactUrl: {}", url);
-        return url;
-    }
-
-    /**
-     * Get the URL for retrieving VNF packages vnfd from ETSI Catalog.
-     *
-     * @param vnfPkgId The ID of the VNF Package
-     * @return the URL for the GET operation
-     */
-    public String getVnfPackageVnfdUrl(final String vnfPkgId) {
-        final String url = etsiCatalogManagerEndpoint + "/vnf_packages/" + vnfPkgId + "/vnfd";
-        logger.info("getEtsiCatalogVnfPackageVnfd: {}", url);
-        return url;
-    }
-
-    /**
-     * Get the URL for posting/retrieving a Subscription
-     *
-     * @return the URL for the operation
-     */
-    public String getSubscriptionUrl() {
-        final String url = etsiCatalogManagerEndpoint + "/subscriptions";
-        logger.info("getSubscriptionNotificationUrl: {}", url);
-        return url;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/vnfm/VnfmHttpServiceProviderConfiguration.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/vnfm/VnfmHttpServiceProviderConfiguration.java
deleted file mode 100644
index 22bbef9c01..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/extclients/vnfm/VnfmHttpServiceProviderConfiguration.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm;
-
-import static org.onap.so.client.RestTemplateConfig.CONFIGURABLE_REST_TEMPLATE;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import org.onap.so.adapters.etsi.sol003.adapter.common.configuration.AbstractServiceProviderConfiguration;
-import org.onap.so.adapters.etsisol003adapter.pkgm.JSON;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.EtsiSubscriptionNotificationController;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.onap.so.rest.service.HttpRestServiceProviderImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- *
- */
-@Configuration
-public class VnfmHttpServiceProviderConfiguration extends AbstractServiceProviderConfiguration {
-    private final JSON.OffsetDateTimeTypeAdapter offsetDateTimeTypeAdapter = new JSON.OffsetDateTimeTypeAdapter();
-
-    public static final String VNFM_ADAPTER_HTTP_SERVICE_PROVIDER_BEAN = "vnfmAdapterHttpServiceProvider";
-
-    @Bean
-    @Qualifier(VNFM_ADAPTER_HTTP_SERVICE_PROVIDER_BEAN)
-    public HttpRestServiceProvider vnfmAdapterHttpRestServiceProvider(
-            @Autowired @Qualifier(CONFIGURABLE_REST_TEMPLATE) RestTemplate restTemplate) {
-        setGsonMessageConverter(restTemplate);
-        return new HttpRestServiceProviderImpl(restTemplate, new BasicHttpHeadersProvider().getHttpHeaders());
-    }
-
-    @Override
-    protected Gson getGson() {
-        return JSON.createGson().registerTypeAdapter(OffsetDateTime.class, offsetDateTimeTypeAdapter)
-                .registerTypeAdapter(LocalDateTime.class,
-                        new EtsiSubscriptionNotificationController.LocalDateTimeTypeAdapter())
-                .create();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationController.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationController.java
deleted file mode 100644
index 2b4b486fa8..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.AbstractMap;
-import java.util.Map.Entry;
-import javax.ws.rs.core.MediaType;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.InternalServerErrorException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.NotificationTypeNotSupportedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt.NotificationManager;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-/**
- * This controller handles the ETSI Subscription Notification Endpoints.
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@Controller
-@RequestMapping(value = ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL)
-public class EtsiSubscriptionNotificationController {
-
-    private static final Logger logger = getLogger(EtsiSubscriptionNotificationController.class);
-    private final NotificationManager notificationManager;
-    private final Gson gson;
-
-    @Autowired
-    public EtsiSubscriptionNotificationController(final NotificationManager notificationManager) {
-        this.notificationManager = notificationManager;
-        this.gson = new GsonBuilder().registerTypeAdapter(LocalDateTime.class, new LocalDateTimeTypeAdapter()).create();
-    }
-
-    @GetMapping(value = "/notification")
-    public ResponseEntity<Void> testSubscriptionNotificationEndPoint() {
-        logger.debug("Testing Notification Endpoint");
-        return ResponseEntity.noContent().build();
-    }
-
-    /**
-     * POST notification on to subscriber.
-     *
-     * @param notification The notification to send.
-     * @return Response Code: 204 No Content if Successful, ProblemDetails Object if not.
-     */
-    @PostMapping(value = "/notification", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON)
-    public ResponseEntity<?> postSubscriptionNotification(@RequestBody final Object notification) {
-        logger.info("Posting subscription notification class: {} \n{}", notification.getClass(), notification);
-        final String notificationString = gson.toJson(notification);
-
-        final Entry<String, Object> notificationObject = getNotificationObject(notificationString);
-        if (notificationManager.processSubscriptionNotification(notificationObject.getValue(),
-                notificationObject.getKey())) {
-            logger.info("Notification Delivered Successfully");
-            return ResponseEntity.noContent().build();
-        }
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed.";
-        logger.error(errorMessage);
-        throw new InternalServerErrorException(errorMessage);
-    }
-
-    private Entry<String, Object> getNotificationObject(final String notification) {
-        logger.info("getNotificationObject() notification: {}", notification);
-        final String notificationType = getNotificationType(notification);
-        if (PkgOnboardingNotification.NotificationTypeEnum.VNFPACKAGEONBOARDINGNOTIFICATION.getValue()
-                .equals(notificationType)) {
-            final PkgOnboardingNotification pkgOnboardingNotification =
-                    gson.fromJson(notification, PkgOnboardingNotification.class);
-            logger.info("Onboarding notification received:\n{}", pkgOnboardingNotification);
-            return new AbstractMap.SimpleEntry<>(pkgOnboardingNotification.getSubscriptionId(),
-                    pkgOnboardingNotification);
-        }
-        if (PkgChangeNotification.NotificationTypeEnum.VNFPACKAGECHANGENOTIFICATION.getValue()
-                .equals(notificationType)) {
-            final PkgChangeNotification pkgChangeNotification =
-                    gson.fromJson(notification, PkgChangeNotification.class);
-            logger.info("Change notification received:\n{}", pkgChangeNotification);
-            return new AbstractMap.SimpleEntry<>(pkgChangeNotification.getSubscriptionId(), pkgChangeNotification);
-
-        }
-
-        final String errorMessage = "An error occurred.  Notification type not supported for: " + notificationType;
-        logger.error(errorMessage);
-        throw new NotificationTypeNotSupportedException(errorMessage);
-
-    }
-
-    private String getNotificationType(final String notification) {
-        try {
-            logger.info("getNotificationType() notification: {}", notification);
-            final JsonParser parser = new JsonParser();
-            final JsonObject element = (JsonObject) parser.parse(notification);
-            return element.get("notificationType").getAsString();
-        } catch (final Exception e) {
-            logger.error("An error occurred processing notificiation: {}", e.getMessage());
-        }
-        throw new NotificationTypeNotSupportedException(
-                "Unable to parse notification type in object \n" + notification);
-    }
-
-    public static class LocalDateTimeTypeAdapter extends TypeAdapter<LocalDateTime> {
-
-        private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-        @Override
-        public void write(final JsonWriter out, final LocalDateTime localDateTime) throws IOException {
-            if (localDateTime == null) {
-                out.nullValue();
-            } else {
-                out.value(FORMATTER.format(localDateTime));
-            }
-        }
-
-        @Override
-        public LocalDateTime read(final JsonReader in) throws IOException {
-            switch (in.peek()) {
-                case NULL:
-                    in.nextNull();
-                    return null;
-                default:
-                    final String dateTime = in.nextString();
-                    return LocalDateTime.parse(dateTime, FORMATTER);
-            }
-        }
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementController.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementController.java
deleted file mode 100644
index 6c1e5e5506..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementController.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.PACKAGE_MANAGEMENT_BASE_URL;
-import static org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants.APPLICATION_ZIP;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.Optional;
-import javax.ws.rs.core.MediaType;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2001;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Controller for handling the VNF Package Management. For further information please read:
- * https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf Use the section number
- * above each endpoint to find the corresponding section in the above document.
- *
- * @author gareth.roper@est.tech
- */
-@Controller
-@RequestMapping(value = PACKAGE_MANAGEMENT_BASE_URL, consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class Sol003PackageManagementController {
-
-    private final EtsiCatalogServiceProvider etsiCatalogServiceProvider;
-    private static final String LOG_REQUEST_RECEIVED = "VNF PackageManagement Controller: {} {} {} {}";
-    private static final Logger logger = getLogger(Sol003PackageManagementController.class);
-
-    @Autowired
-    Sol003PackageManagementController(final EtsiCatalogServiceProvider etsiCatalogServiceProvider) {
-        this.etsiCatalogServiceProvider = etsiCatalogServiceProvider;
-    }
-
-    /**
-     * GET VNF packages information. Will return zero or more VNF package representations that match the attribute
-     * filter. These representations will be in a list. Section Number: 10.4.2
-     * 
-     * @return An Array of all VNF packages. Object: InlineResponse2001[] Response Code: 200 OK
-     */
-    @GetMapping(value = "/vnf_packages", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getVnfPackages() {
-        logger.info(LOG_REQUEST_RECEIVED, "getVnfPackages.");
-        final Optional<InlineResponse2001[]> response = etsiCatalogServiceProvider.getVnfPackages();
-        if (response.isPresent()) {
-            logger.info(LOG_REQUEST_RECEIVED, "getVnfPackages Response: ", HttpStatus.OK);
-            return ResponseEntity.ok().body(response.get());
-        }
-        final String errorMessage = "An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"vnf_packages\" \n"
-                + "endpoint.";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * GET VNF package information. Will return a specific VNF package representation that match the attribute filter.
-     * Section Number: 10.4.3
-     *
-     * @param vnfPkgId The ID of the VNF Package that you want to query.
-     * @return A VNF package based on vnfPkgId. Object: VnfPkgInfo Response Code: 200 OK
-     */
-    @GetMapping(value = "/vnf_packages/{vnfPkgId}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResponseEntity<?> getVnfPackage(@PathVariable("vnfPkgId") final String vnfPkgId) {
-        logger.info(LOG_REQUEST_RECEIVED, "getVnfPackage: ", vnfPkgId);
-        final Optional<InlineResponse2001> response = etsiCatalogServiceProvider.getVnfPackage(vnfPkgId);
-        if (response.isPresent()) {
-            logger.info(LOG_REQUEST_RECEIVED, "getVnfPackage Response: ", HttpStatus.OK);
-            return ResponseEntity.ok().body(response.get());
-        }
-        final String errorMessage = "An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"vnf_packages\" by vnfPkgId: \""
-                + vnfPkgId + "\" \n" + "endpoint.";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * GET VNFD, from VNF package. Will return a copy of the file representing the VNFD or a ZIP file that contains the
-     * file/multiple files representing the VNFD specified. Section Number: 10.4.4
-     *
-     * @param vnfPkgId The ID of the VNF Package that you want to retrieve the VNFD from.
-     * @return The VNFD of a VNF Package as a single file or within a ZIP file. Object: byte[] Response Code: 200 OK
-     */
-    @GetMapping(value = "/vnf_packages/{vnfPkgId}/vnfd",
-            produces = {MediaType.TEXT_PLAIN, APPLICATION_ZIP, MediaType.APPLICATION_JSON})
-    public ResponseEntity<?> getVnfPackageVnfd(@PathVariable("vnfPkgId") final String vnfPkgId) {
-        logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageVnfd Endpoint Invoked with VNF Package ID: ", vnfPkgId);
-        final Optional<byte[]> response = etsiCatalogServiceProvider.getVnfPackageVnfd(vnfPkgId);
-        if (response.isPresent()) {
-            logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageVnfd Response: ", HttpStatus.OK);
-            return new ResponseEntity<>(response.get(), HttpStatus.OK);
-        }
-        final String errorMessage = "An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"vnfd\" \n"
-                + "endpoint.";
-
-        logger.error(errorMessage);
-        return new ResponseEntity<>(new ProblemDetails().detail(errorMessage), HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-
-    /**
-     * GET Package Content, from VNF Package. Will return a copy of the VNF package file that you specified. Section
-     * Number: 10.4.5
-     * 
-     * @param vnfPkgId The ID of the VNF Package that you want to retrieve the "package_content" from.
-     * @return The Package Content of a VNF Package. Object: byte[] Response Code: 200 OK
-     */
-    @GetMapping(value = "/vnf_packages/{vnfPkgId}/package_content",
-            produces = {MediaType.APPLICATION_JSON, APPLICATION_ZIP, MediaType.APPLICATION_OCTET_STREAM})
-    public ResponseEntity<?> getVnfPackageContent(@PathVariable("vnfPkgId") final String vnfPkgId) {
-        logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageContent Endpoint Invoked with VNF Package ID: ", vnfPkgId);
-        final Optional<byte[]> response = etsiCatalogServiceProvider.getVnfPackageContent(vnfPkgId);
-        if (response.isPresent()) {
-            logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageContent Response: ", HttpStatus.OK);
-            return ResponseEntity.ok().body(response.get());
-        }
-        final String errorMessage = "An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"package_content\" \n"
-                + "endpoint.";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * GET Artifact, from VNF Package Will return a the content of the artifact that you specified. Section Number:
-     * 10.4.6
-     * 
-     * @param vnfPkgId The ID of the VNF Package that you want to retrieve an artifact from.
-     * @param artifactPath The path of the artifact that you want to retrieve.
-     * @return An Artifact from a VNF Package. Object: byte[] Response Code: 200 OK
-     */
-    @GetMapping(value = "/vnf_packages/{vnfPkgId}/artifacts/{artifactPath}",
-            produces = {MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_JSON})
-    public ResponseEntity<?> getVnfPackageArtifact(@PathVariable("vnfPkgId") final String vnfPkgId,
-            @PathVariable("artifactPath") final String artifactPath) {
-        logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageArtifact: vnfPkgId= ", vnfPkgId, " artifactPath=",
-                artifactPath);
-        final Optional<byte[]> response = etsiCatalogServiceProvider.getVnfPackageArtifact(vnfPkgId, artifactPath);
-        if (response.isPresent()) {
-            logger.info(LOG_REQUEST_RECEIVED, "getVnfPackageArtifact Response: ", HttpStatus.OK);
-            return ResponseEntity.ok().body(response.get());
-        }
-        final String errorMessage = "An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the\n GET \"vnf_packages\" by vnfPkgId: \""
-                + vnfPkgId + "\" for artifactPath: \"" + artifactPath + "\"\n" + "endpoint.";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionController.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionController.java
deleted file mode 100644
index 7314f6aa2e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.PACKAGE_MANAGEMENT_BASE_URL;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.net.URI;
-import java.security.GeneralSecurityException;
-import java.util.List;
-import java.util.Optional;
-import javax.ws.rs.core.MediaType;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt.SubscriptionManager;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Controller for handling the Subscription Management. The client can use this resource to subscribe to notifications
- * related to the VNF package management, and to query its subscriptions. For further information please read:
- * https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf Use the section number
- * above each endpoint to find the corresponding section in the above document.
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Controller
-@RequestMapping(value = PACKAGE_MANAGEMENT_BASE_URL, produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML},
-        consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class Sol003PackageManagementSubscriptionController {
-
-    private static final String LOG_REQUEST_RECEIVED = "Subscription Management Controller: {} {}";
-    private static final Logger logger = getLogger(Sol003PackageManagementSubscriptionController.class);
-    private final SubscriptionManager subscriptionManager;
-
-    @Autowired
-    public Sol003PackageManagementSubscriptionController(final SubscriptionManager subscriptionManager) {
-        this.subscriptionManager = subscriptionManager;
-    }
-
-    /**
-     * POST Subscribe request. Will send request and respond with the subscription that you subscribed to, if
-     * successful. Section Number: 10.4.7
-     * 
-     * @param pkgmSubscriptionRequest This includes the details of the subscription to be created.
-     * @return The subscription requested, if successful. Object: InlineRespone2002 Response Code: 201 Created Response
-     *         Code: 303 Duplicate Subscription
-     * @throws GeneralSecurityException
-     */
-    @PostMapping(value = "/subscriptions")
-    public ResponseEntity<?> postSubscriptionRequest(@RequestBody final PkgmSubscriptionRequest pkgmSubscriptionRequest)
-            throws GeneralSecurityException {
-        logger.info(LOG_REQUEST_RECEIVED, " postSubscriptionRequest Endpoint Called", pkgmSubscriptionRequest);
-
-        // Check if subscription exists already.
-        final Optional<String> exists = subscriptionManager.getSubscriptionId(pkgmSubscriptionRequest);
-
-        if (exists.isPresent()) {
-            final URI subscriptionUri = subscriptionManager.getSubscriptionUri(exists.get());
-            final HttpHeaders headers = createLocationHeader(subscriptionUri);
-            logger.info("PkgmSubscriptionRequest already exists with uri {} ", subscriptionUri);
-            return new ResponseEntity<>(headers, HttpStatus.SEE_OTHER);
-        }
-
-        logger.debug("No duplicate Subscription exists, continuing with POST.");
-        final Optional<InlineResponse201> optionalInlineResponse =
-                subscriptionManager.createSubscription(pkgmSubscriptionRequest);
-
-        if (optionalInlineResponse.isPresent()) {
-            InlineResponse201 inlineResponse = optionalInlineResponse.get();
-            final URI subscriptionUri = subscriptionManager.getSubscriptionUri(inlineResponse.getId());
-            final HttpHeaders headers = createLocationHeader(subscriptionUri);
-            logger.debug("Sending response with uri {} ", subscriptionUri);
-            return new ResponseEntity<>(inlineResponse, headers, HttpStatus.CREATED);
-        }
-        final String errorMessage = "A null response was received during the postSubscriptionRequest call.";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * GET all subscriptions. Will return a list of all subscriptions currently active. Section Number: 10.4.7
-     * 
-     * @return All of the current active subscriptions. Object: List<InlineResponse2002> Response Code: 200 OK
-     */
-    @GetMapping(value = "/subscriptions")
-    public ResponseEntity<List<InlineResponse201>> getSubscriptions() {
-        logger.info(LOG_REQUEST_RECEIVED, " getSubscriptions.");
-        List<InlineResponse201> subscriptionsList = subscriptionManager.getSubscriptions();
-        return new ResponseEntity<>(subscriptionsList, HttpStatus.OK);
-    }
-
-    /**
-     * GET a specific subscription, by subscriptionId. Section Number: 10.4.8
-     * 
-     * @param subscriptionId The ID of the subscription that you wish to retrieve.
-     * @return A subscription based on subscriptionId. Object: InlineResponse2002 Response Code: 200 OK
-     */
-    @GetMapping(value = "/subscriptions/{subscriptionId}")
-    public ResponseEntity<?> getSubscription(@PathVariable("subscriptionId") final String subscriptionId) {
-        logger.info(LOG_REQUEST_RECEIVED, " Getting Subscription: ", subscriptionId);
-        final Optional<InlineResponse201> optional = subscriptionManager.getSubscription(subscriptionId);
-        if (optional.isPresent()) {
-            logger.debug("Return subscription with id {} and body {}", subscriptionId, optional);
-            return new ResponseEntity<>(optional.get(), HttpStatus.OK);
-        }
-        final String errorMessage =
-                "The requested subscription: " + subscriptionId + " was not found on call getSubscription";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * DELETE a specific subscription, by subscriptionId. Section Number: 10.4.8.3.5
-     *
-     * @param subscriptionId The ID of the subscription that you wish to delete.
-     * @return Empty response if successful. Object: Void Response Code: 204 No Content
-     */
-    @DeleteMapping(value = "/subscriptions/{subscriptionId}")
-    public ResponseEntity<?> deleteSubscription(@PathVariable("subscriptionId") final String subscriptionId) {
-        if (subscriptionManager.deleteSubscription(subscriptionId)) {
-            logger.debug("Successfully deleted subscription with id {}", subscriptionId);
-            return ResponseEntity.noContent().build();
-        }
-        final String errorMessage =
-                "The requested subscription: " + subscriptionId + " was not found on call deleteSubscription";
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    /**
-     * Method to set the Location in the header with the URI parameter
-     * 
-     * @param subscriptionUri
-     * @return header with callbackUri in Location
-     */
-    private HttpHeaders createLocationHeader(final URI subscriptionUri) {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.setLocation(subscriptionUri);
-        return headers;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/AuthenticationTypeNotSupportedException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/AuthenticationTypeNotSupportedException.java
deleted file mode 100644
index 6e1330140f..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/AuthenticationTypeNotSupportedException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an unsupported authentication type
- * 
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
-public class AuthenticationTypeNotSupportedException extends RuntimeException {
-
-    private static final long serialVersionUID = 2939423208362066902L;
-
-    public AuthenticationTypeNotSupportedException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/ConversionFailedException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/ConversionFailedException.java
deleted file mode 100644
index 9e9cb8e352..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/ConversionFailedException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for Conversion Failures
- * 
- * @author Gareth Roper (gareth.roper@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
-public class ConversionFailedException extends RuntimeException {
-
-    private static final long serialVersionUID = 45898561453196895L;
-
-    public ConversionFailedException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerBadRequestException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerBadRequestException.java
deleted file mode 100644
index 7d9d5fc17a..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerBadRequestException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an ETSI Catalog Manager Bad Request Exception.
- * 
- * @author Gareth Roper (gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.BAD_REQUEST)
-public class EtsiCatalogManagerBadRequestException extends RuntimeException {
-
-    private static final long serialVersionUID = 6571317418914258768L;
-
-    public EtsiCatalogManagerBadRequestException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerRequestFailureException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerRequestFailureException.java
deleted file mode 100644
index 110826a6d3..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiCatalogManagerRequestFailureException.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an ETSI Catalog Manager Request Failure
- * 
- * @author gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
-public class EtsiCatalogManagerRequestFailureException extends RuntimeException {
-
-    private static final long serialVersionUID = 66862444537194516L;
-
-    public EtsiCatalogManagerRequestFailureException(final String message) {
-        super(message);
-    }
-
-    public EtsiCatalogManagerRequestFailureException(final String message, final Throwable cause) {
-        super(message, cause);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiSubscriptionNotificationControllerExceptionHandler.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiSubscriptionNotificationControllerExceptionHandler.java
deleted file mode 100644
index 645ef96326..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/EtsiSubscriptionNotificationControllerExceptionHandler.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.EtsiSubscriptionNotificationController;
-import org.onap.so.rest.exceptions.HttpResouceNotFoundException;
-import org.onap.so.rest.exceptions.InvalidRestRequestException;
-import org.onap.so.rest.exceptions.RestProcessingException;
-import org.slf4j.Logger;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-/**
- * Exception Handler for the Etsi Subscription Notification Controller {@link EtsiSubscriptionNotificationController
- * EtsiSubscriptionNotificationController}
- * 
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@ControllerAdvice(assignableTypes = EtsiSubscriptionNotificationController.class)
-public class EtsiSubscriptionNotificationControllerExceptionHandler {
-
-    private static final Logger logger = getLogger(EtsiSubscriptionNotificationControllerExceptionHandler.class);
-
-    @ExceptionHandler(InvalidRestRequestException.class)
-    public ResponseEntity<ProblemDetails> handleInvalidRestRequestException(
-            final InvalidRestRequestException invalidRestRequestException) {
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.BAD_REQUEST + ".\n" + invalidRestRequestException.getMessage();
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    @ExceptionHandler(HttpResouceNotFoundException.class)
-    public ResponseEntity<ProblemDetails> handleHttpResourceNotFoundException(
-            final HttpResouceNotFoundException httpResourceNotFoundException) {
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.NOT_FOUND + ".\n" + httpResourceNotFoundException.getMessage();
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    @ExceptionHandler(RestProcessingException.class)
-    public ResponseEntity<ProblemDetails> handleRestProcessingException(
-            final RestProcessingException restProcessingException) {
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + restProcessingException.getStatusCode() + ".\n" + restProcessingException.getMessage();
-        logger.error(errorMessage);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ProblemDetails().detail(errorMessage));
-    }
-
-    @ExceptionHandler(InternalServerErrorException.class)
-    public ResponseEntity<ProblemDetails> handleInternalServerErrorException(
-            final InternalServerErrorException internalServerErrorException) {
-        logger.error(internalServerErrorException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ProblemDetails().detail(internalServerErrorException.getMessage()));
-    }
-
-    @ExceptionHandler(AuthenticationTypeNotSupportedException.class)
-    public ResponseEntity<ProblemDetails> handleAuthenticationTypeNotSupportedException(
-            final AuthenticationTypeNotSupportedException authenticationTypeNotSupportedException) {
-        logger.error(authenticationTypeNotSupportedException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ProblemDetails().detail(authenticationTypeNotSupportedException.getMessage()));
-    }
-
-    @ExceptionHandler(ConversionFailedException.class)
-    public ResponseEntity<ProblemDetails> handleConversionFailedException(
-            final ConversionFailedException conversionFailedException) {
-        logger.error(conversionFailedException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ProblemDetails().detail(conversionFailedException.getMessage()));
-    }
-
-    @ExceptionHandler(NotificationTypeNotSupportedException.class)
-    public ResponseEntity<ProblemDetails> handleNotificationTypeNotSupportedException(
-            final NotificationTypeNotSupportedException notificationTypeNotSupportedException) {
-        logger.error(notificationTypeNotSupportedException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ProblemDetails().detail(notificationTypeNotSupportedException.getMessage()));
-    }
-
-    @ExceptionHandler(SubscriptionNotFoundException.class)
-    public ResponseEntity<ProblemDetails> handleSubscriptionNotFoundException(
-            final SubscriptionNotFoundException subscriptionNotFoundException) {
-        logger.error(subscriptionNotFoundException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                .body(new ProblemDetails().detail(subscriptionNotFoundException.getMessage()));
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/InternalServerErrorException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/InternalServerErrorException.java
deleted file mode 100644
index 9dd7f1b7b2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/InternalServerErrorException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an ETSI Catalog Manager Request Failure
- * 
- * @author gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
-public class InternalServerErrorException extends RuntimeException {
-
-    private static final long serialVersionUID = 66864561537194516L;
-
-    public InternalServerErrorException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/NotificationTypeNotSupportedException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/NotificationTypeNotSupportedException.java
deleted file mode 100644
index 7716037342..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/NotificationTypeNotSupportedException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an unsupported notification type
- * 
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@ResponseStatus(code = HttpStatus.INTERNAL_SERVER_ERROR)
-public class NotificationTypeNotSupportedException extends RuntimeException {
-
-    private static final long serialVersionUID = 2939423208362066902L;
-
-    public NotificationTypeNotSupportedException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/Sol003PackageManagementControllerExceptionHandler.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/Sol003PackageManagementControllerExceptionHandler.java
deleted file mode 100644
index 9f97b4ae02..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/Sol003PackageManagementControllerExceptionHandler.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.Sol003PackageManagementController;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-/**
- * Exception Handler for the Package Management Controller {@link Sol003PackageManagementController Sol003Controller}
- * 
- * @author gareth.roper@est.tech
- */
-@ControllerAdvice(assignableTypes = Sol003PackageManagementController.class)
-
-public class Sol003PackageManagementControllerExceptionHandler {
-
-    @ExceptionHandler(EtsiCatalogManagerRequestFailureException.class)
-    public ResponseEntity<ProblemDetails> handleEtsiCatalogManagerRequestFailureException(
-            final EtsiCatalogManagerRequestFailureException etsiCatalogManagerRequestFailureException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(etsiCatalogManagerRequestFailureException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(problemDetails);
-    }
-
-    @ExceptionHandler(EtsiCatalogManagerBadRequestException.class)
-    public ResponseEntity<ProblemDetails> handleEtsiCatalogManagerBadRequestFailureException(
-            final EtsiCatalogManagerBadRequestException etsiCatalogManagerBadRequestException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(etsiCatalogManagerBadRequestException.getMessage());
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(problemDetails);
-    }
-
-    @ExceptionHandler(SubscriptionNotFoundException.class)
-    public ResponseEntity<ProblemDetails> handleSubscriptionNotFoundException(
-            final SubscriptionNotFoundException subscriptionNotFoundException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(subscriptionNotFoundException.getMessage());
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(problemDetails);
-    }
-
-    @ExceptionHandler(ConversionFailedException.class)
-    public ResponseEntity<ProblemDetails> handleConversionFailedException(
-            final ConversionFailedException conversionFailedException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(conversionFailedException.getMessage());
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(problemDetails);
-    }
-
-    @ExceptionHandler(VnfPkgConflictException.class)
-    public ResponseEntity<ProblemDetails> handleVnfPkgConflictException(
-            final VnfPkgConflictException vnfPkgConflictException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(vnfPkgConflictException.getMessage());
-        return ResponseEntity.status(HttpStatus.CONFLICT).body(problemDetails);
-    }
-
-    @ExceptionHandler(VnfPkgNotFoundException.class)
-    public ResponseEntity<ProblemDetails> handleVnfPkgNotFoundException(
-            final VnfPkgNotFoundException vnfPkgNotFoundException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(vnfPkgNotFoundException.getMessage());
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(problemDetails);
-    }
-
-    @ExceptionHandler(VnfPkgBadRequestException.class)
-    public ResponseEntity<ProblemDetails> handleVnfPkgBadRequestException(
-            final VnfPkgBadRequestException vnfPkgBadRequestException) {
-        final ProblemDetails problemDetails = new ProblemDetails();
-        problemDetails.setDetail(vnfPkgBadRequestException.getMessage());
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(problemDetails);
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/SubscriptionNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/SubscriptionNotFoundException.java
deleted file mode 100644
index af409e7399..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/SubscriptionNotFoundException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for an ETSI Catalog Manager Request Failure
- * 
- * @author gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.NOT_FOUND)
-public class SubscriptionNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 85268561453194516L;
-
-    public SubscriptionNotFoundException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgBadRequestException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgBadRequestException.java
deleted file mode 100644
index 5c318da89f..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgBadRequestException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for a Vnfpkg Bad Request failure, due to state of resource.
- * 
- * @author andrew.a.lamb@est.tech
- */
-@ResponseStatus(code = HttpStatus.BAD_REQUEST)
-public class VnfPkgBadRequestException extends RuntimeException {
-
-    private static final long serialVersionUID = 3301317418914258411L;
-
-    public VnfPkgBadRequestException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgConflictException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgConflictException.java
deleted file mode 100644
index 7cb7a0c860..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgConflictException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for a VnfPkg Conflict failures, due to state of resource.
- * 
- * @author gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.CONFLICT)
-public class VnfPkgConflictException extends RuntimeException {
-
-    private static final long serialVersionUID = 26862444537198441L;
-
-    public VnfPkgConflictException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgNotFoundException.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgNotFoundException.java
deleted file mode 100644
index 5ed4847173..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/exceptions/VnfPkgNotFoundException.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-/**
- * Exception for VnfPkg Not Found Failures
- * 
- * @author gareth.roper@est.tech
- */
-@ResponseStatus(code = HttpStatus.NOT_FOUND)
-public class VnfPkgNotFoundException extends RuntimeException {
-
-    private static final long serialVersionUID = 26862444537198441L;
-
-    public VnfPkgNotFoundException(final String message) {
-        super(message);
-    }
-
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-        return this;
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/AbstractNotificationServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/AbstractNotificationServiceProvider.java
deleted file mode 100644
index b6ba1ede95..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/AbstractNotificationServiceProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.VnfmHttpServiceProviderConfiguration.VNFM_ADAPTER_HTTP_SERVICE_PROVIDER_BEAN;
-import java.nio.charset.StandardCharsets;
-import org.apache.commons.codec.binary.Base64;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-
-/**
- * A base class that can be extended by classes for providing notification services. Provides common methods that will
- * be useful to those classes.
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-public abstract class AbstractNotificationServiceProvider {
-
-    @Autowired
-    @Qualifier(VNFM_ADAPTER_HTTP_SERVICE_PROVIDER_BEAN)
-    private HttpRestServiceProvider httpRestServiceProvider;
-
-    protected HttpRestServiceProvider getHttpRestServiceProvider() {
-        return httpRestServiceProvider;
-    }
-
-    protected BasicHttpHeadersProvider getBasicHttpHeadersProviderWithBasicAuth(final String username,
-            final String password) {
-        final byte[] encodedAuth = getBasicAuth(username, password);
-        final String authHeader = "Basic " + new String(encodedAuth);
-        return new BasicHttpHeadersProvider(authHeader);
-    }
-
-    protected byte[] getBasicAuth(final String username, final String password) {
-        final String auth = username + ":" + password;
-        return Base64.encodeBase64(auth.getBytes(StandardCharsets.ISO_8859_1));
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/BasicAuthNotificationServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/BasicAuthNotificationServiceProvider.java
deleted file mode 100644
index ffe8529c93..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/BasicAuthNotificationServiceProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.configuration.rest.HttpHeadersProvider;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.slf4j.Logger;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation of a NotificationServiceProvider which supports Basic Authentication
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@Service
-public class BasicAuthNotificationServiceProvider extends AbstractNotificationServiceProvider
-        implements NotificationServiceProvider {
-
-    private static final Logger logger = getLogger(BasicAuthNotificationServiceProvider.class);
-
-    @Override
-    public boolean send(final Object notification, final SubscriptionsAuthentication subscriptionsAuthentication,
-            final String callbackUri) {
-        logger.info("Sending notification to uri: {}", callbackUri);
-        final HttpHeadersProvider httpHeadersProvider =
-                getBasicHttpHeadersProviderWithBasicAuth(subscriptionsAuthentication.getParamsBasic().getUserName(),
-                        subscriptionsAuthentication.getParamsBasic().getPassword());
-        final HttpRestServiceProvider httpRestServiceProvider = getHttpRestServiceProvider();
-
-        final ResponseEntity<Void> responseEntity = httpRestServiceProvider.postHttpRequest(notification, callbackUri,
-                httpHeadersProvider.getHttpHeaders(), Void.class);
-        if (responseEntity.getStatusCode().is2xxSuccessful()) {
-            logger.info("Notification sent successfully.");
-            return true;
-        }
-
-        logger.error("Failed to send notification.");
-        return false;
-    }
-
-    @Override
-    public AuthTypeEnum getAuthType() {
-        return AuthTypeEnum.BASIC;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationManager.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationManager.java
deleted file mode 100644
index 82b1a7d4c3..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationManager.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.List;
-import java.util.Optional;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.AuthenticationTypeNotSupportedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.ConversionFailedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.NotificationTypeNotSupportedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.SubscriptionNotFoundException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.stereotype.Service;
-
-/**
- * Manages package management subscription notifications to the VNFMs
- *
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- *
- */
-@Service
-public class NotificationManager {
-
-    private static final Logger logger = getLogger(NotificationManager.class);
-    private final ConversionService conversionService;
-    private final SubscriptionManager subscriptionManager;
-    private final NotificationServiceProviderFactory notificationServiceProviderFactory;
-
-    @Autowired
-    public NotificationManager(final SubscriptionManager subscriptionManager, final ConversionService conversionService,
-            final NotificationServiceProviderFactory notificationServiceProviderFactory) {
-        this.subscriptionManager = subscriptionManager;
-        this.conversionService = conversionService;
-        this.notificationServiceProviderFactory = notificationServiceProviderFactory;
-    }
-
-    /**
-     * Process a subscription notification. Checks for a subscription request stored in the adapter and if there is, it
-     * sends the notification to the subscribed vnfm.
-     * 
-     * @param notification the notification to send to the vnfm
-     * @param subscriptionId the id of the subscription request
-     * @return true if the notification is successfully sent
-     */
-    public boolean processSubscriptionNotification(final Object notification, final String subscriptionId) {
-        final Optional<PkgmSubscriptionRequest> optionalSubscription =
-                subscriptionManager.getSubscriptionRequest(subscriptionId);
-        if (optionalSubscription.isPresent()) {
-            final PkgmSubscriptionRequest subscriptionRequest = optionalSubscription.get();
-            return notifyVnfm(subscriptionRequest, notification);
-        }
-        final String errorMessage = "No subscription found with subscriptionId " + subscriptionId
-                + ". Unable to forward notification to subscriber.";
-        logger.error(errorMessage);
-        throw new SubscriptionNotFoundException(errorMessage);
-    }
-
-    private boolean notifyVnfm(final PkgmSubscriptionRequest subscriptionRequest, final Object notification) {
-        if (!(notification instanceof PkgOnboardingNotification) && !(notification instanceof PkgChangeNotification)) {
-            final String errorMessage =
-                    "An error occurred.  Notification type not supported for: " + notification.getClass();
-            logger.error(errorMessage);
-            throw new NotificationTypeNotSupportedException(errorMessage);
-        }
-
-        final SubscriptionsAuthentication subscriptionsAuthentication = subscriptionRequest.getAuthentication();
-        final AuthTypeEnum authType = getAuthType(subscriptionsAuthentication.getAuthType());
-        final NotificationServiceProvider sender = notificationServiceProviderFactory.getNotificationSender(authType);
-
-        final Object vnfmNotificationObject = convertEtsiCatalogNotification(notification);
-
-        if (sender.send(vnfmNotificationObject, subscriptionsAuthentication, subscriptionRequest.getCallbackUri())) {
-            logger.info("Notification delivered successfully {}", notification);
-            return true;
-        }
-
-        logger.error("Failed to deliver notification.");
-        return false;
-    }
-
-    private SubscriptionsAuthentication.AuthTypeEnum getAuthType(final List<AuthTypeEnum> authTypes) {
-        if (authTypes.contains(SubscriptionsAuthentication.AuthTypeEnum.TLS_CERT)) {
-            return SubscriptionsAuthentication.AuthTypeEnum.TLS_CERT;
-        }
-        if (authTypes.contains(SubscriptionsAuthentication.AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS)) {
-            return SubscriptionsAuthentication.AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS;
-        }
-        if (authTypes.contains(SubscriptionsAuthentication.AuthTypeEnum.BASIC)) {
-            return SubscriptionsAuthentication.AuthTypeEnum.BASIC;
-        }
-        final String errorMessage =
-                "An error occurred. No supported authentication type provided in subscription request.";
-        logger.error(errorMessage);
-        throw new AuthenticationTypeNotSupportedException(errorMessage);
-    }
-
-    private Object convertEtsiCatalogNotification(final Object etsiCatalogNotification) {
-        logger.info("Converting notification:\n {}", etsiCatalogNotification);
-        if (conversionService.canConvert(etsiCatalogNotification.getClass(), VnfPackageOnboardingNotification.class)) {
-            return conversionService.convert(etsiCatalogNotification, VnfPackageOnboardingNotification.class);
-        } else if (conversionService.canConvert(etsiCatalogNotification.getClass(),
-                VnfPackageChangeNotification.class)) {
-            return conversionService.convert(etsiCatalogNotification, VnfPackageChangeNotification.class);
-        }
-        final String errorMessage = "An error occurred. Unable to convert provided notification object.";
-        logger.error(errorMessage + "\n" + etsiCatalogNotification);
-        throw new ConversionFailedException(errorMessage);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProvider.java
deleted file mode 100644
index 2fc7e19eb6..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-
-/**
- * Interface which lays out requirements for a Notification Service Provider
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-public interface NotificationServiceProvider {
-
-    /**
-     * Method to send a notification to a uri, given the subscription authentication
-     * 
-     * @param notification The notification to send
-     * @param subscriptionsAuthentication Object containing the authentication details
-     * @param callbackUri The uri to send the notification to
-     * @return true if notification is delivered successfully, otherwise false
-     */
-    boolean send(final Object notification, final SubscriptionsAuthentication subscriptionsAuthentication,
-            final String callbackUri);
-
-    /**
-     * Method to get the supported authorization type of the service provider
-     * 
-     * @return the supported AuthTypeEnum
-     */
-    AuthTypeEnum getAuthType();
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProviderFactory.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProviderFactory.java
deleted file mode 100644
index 2b8e818c9c..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/NotificationServiceProviderFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.AuthenticationTypeNotSupportedException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * Factory to provide a notification services
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@Component
-public class NotificationServiceProviderFactory {
-
-    private static final Logger logger = getLogger(NotificationServiceProviderFactory.class);
-    private static final Map<AuthTypeEnum, NotificationServiceProvider> CACHE = new HashMap<>();
-
-    @Autowired
-    public NotificationServiceProviderFactory(final List<NotificationServiceProvider> services) {
-        for (final NotificationServiceProvider notificationServiceProvider : services) {
-            logger.debug("Adding {} of type {} to cache", notificationServiceProvider.getClass().getCanonicalName(),
-                    notificationServiceProvider.getAuthType());
-            CACHE.put(notificationServiceProvider.getAuthType(), notificationServiceProvider);
-        }
-    }
-
-    /**
-     * Get a notification service for a given authorization type
-     * 
-     * @param type the type of authentication required
-     * @return the notification service
-     */
-    public NotificationServiceProvider getNotificationSender(final AuthTypeEnum type) {
-        final NotificationServiceProvider service = CACHE.get(type);
-        if (service == null) {
-            throw new AuthenticationTypeNotSupportedException("Unknown type: " + type);
-        }
-        return service;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthNotificationServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthNotificationServiceProvider.java
deleted file mode 100644
index 81dc743a22..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthNotificationServiceProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.InternalServerErrorException;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.onap.so.configuration.rest.HttpHeadersProvider;
-import org.onap.so.rest.service.HttpRestServiceProvider;
-import org.slf4j.Logger;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- *
- */
-@Service
-public class OAuthNotificationServiceProvider extends AbstractNotificationServiceProvider
-        implements NotificationServiceProvider {
-
-    private static final Logger logger = getLogger(OAuthNotificationServiceProvider.class);
-
-    @Override
-    public boolean send(final Object notification, final SubscriptionsAuthentication subscriptionsAuthentication,
-            final String callbackUri) {
-        logger.info("Sending notification to uri: {}", callbackUri);
-        logger.info("Object: {}", notification);
-        final String token = getAccessToken(subscriptionsAuthentication);
-
-        if (token == null) {
-            logger.error("Failed to get access token");
-            return false;
-        }
-
-        final HttpHeadersProvider httpHeadersProvider = getHttpHeadersProvider(token);
-        final HttpRestServiceProvider httpRestServiceProvider = getHttpRestServiceProvider();
-        final ResponseEntity<Void> responseEntity = httpRestServiceProvider.postHttpRequest(notification, callbackUri,
-                httpHeadersProvider.getHttpHeaders(), Void.class);
-        if (responseEntity.getStatusCode().is2xxSuccessful()) {
-            logger.info("Notification sent successfully.");
-            return true;
-        }
-
-        logger.error("Failed to send notification.");
-        return false;
-    }
-
-    @Override
-    public AuthTypeEnum getAuthType() {
-        return AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS;
-    }
-
-    private BasicHttpHeadersProvider getHttpHeadersProvider(final String token) {
-        final String authHeader = "Bearer " + token;
-        return new BasicHttpHeadersProvider(authHeader);
-    }
-
-    private String getAccessToken(final SubscriptionsAuthentication subscriptionsAuthentication) {
-        logger.info("Requesting Access Token.");
-
-        final String tokenEndpoint = subscriptionsAuthentication.getParamsOauth2ClientCredentials().getTokenEndpoint();
-
-        final HttpHeadersProvider httpHeadersProvider = getBasicHttpHeadersProviderWithBasicAuth(
-                subscriptionsAuthentication.getParamsOauth2ClientCredentials().getClientId(),
-                subscriptionsAuthentication.getParamsOauth2ClientCredentials().getClientPassword());
-
-        final HttpRestServiceProvider httpRestServiceProvider = getHttpRestServiceProvider();
-        final ResponseEntity<OAuthTokenResponse> responseEntity = httpRestServiceProvider.postHttpRequest(null,
-                tokenEndpoint, httpHeadersProvider.getHttpHeaders(), OAuthTokenResponse.class);
-        if (responseEntity.getStatusCode().is2xxSuccessful()) {
-            if (responseEntity.getBody() != null) {
-                logger.info("Returning Access Token.");
-                return responseEntity.getBody().getAccessToken();
-            }
-        }
-
-        final String errorMessage = "An error occurred.  Unable to retrieve OAuth Token from VNFM for notification.";
-        logger.error(errorMessage);
-        throw new InternalServerErrorException(errorMessage);
-    }
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthTokenResponse.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthTokenResponse.java
deleted file mode 100644
index 3e6f7bde2b..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/OAuthTokenResponse.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlElement;
-import com.google.gson.annotations.SerializedName;
-
-/**
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-public class OAuthTokenResponse implements Serializable {
-
-    private static final long serialVersionUID = -6455742984985959926L;
-
-    @XmlElement(name = "access_token")
-    @SerializedName("access_token")
-    private String accessToken;
-
-    /**
-     * Get the Accees Token
-     *
-     * @return the Access Token
-     */
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    /**
-     * Set the Access Token
-     *
-     * @param accessToken
-     */
-    public void setAccessToken(final String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/SubscriptionManager.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/SubscriptionManager.java
deleted file mode 100644
index edae41525e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/SubscriptionManager.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.SubscriptionAuthentication.AuthTypeEnum.BASIC;
-import static org.slf4j.LoggerFactory.getLogger;
-import java.net.URI;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.onap.so.adapters.etsi.sol003.adapter.common.VnfmAdapterUrlProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.cache.PkgmCacheServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProvider;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.BasicAuth;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.NsdmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesLinksSelf;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.ConversionFailedException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.InternalServerErrorException;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.SubscriptionNotFoundException;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.stereotype.Service;
-
-/**
- * Manages package management subscriptions from the VNFMs
- *
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@Service
-public class SubscriptionManager {
-
-    private static final Logger logger = getLogger(SubscriptionManager.class);
-    private final PkgmCacheServiceProvider packageManagementCacheServiceProvider;
-    private final ConversionService conversionService;
-    private final EtsiCatalogServiceProvider etsiCatalogServiceProvider;
-    private final VnfmAdapterUrlProvider vnfmAdapterUrlProvider;
-
-    @Autowired
-    public SubscriptionManager(final PkgmCacheServiceProvider packageManagementCacheServiceProvider,
-            final ConversionService conversionService, final EtsiCatalogServiceProvider etsiCatalogServiceProvider,
-            final VnfmAdapterUrlProvider vnfmAdapterUrlProvider) {
-        this.packageManagementCacheServiceProvider = packageManagementCacheServiceProvider;
-        this.conversionService = conversionService;
-        this.etsiCatalogServiceProvider = etsiCatalogServiceProvider;
-        this.vnfmAdapterUrlProvider = vnfmAdapterUrlProvider;
-    }
-
-    public Optional<InlineResponse201> createSubscription(final PkgmSubscriptionRequest pkgmSubscriptionRequest)
-            throws GeneralSecurityException {
-
-        final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest etsiCatalogManagerSubscriptionRequest =
-                buildEtsiCatalogManagerPkgmSubscriptionRequest(pkgmSubscriptionRequest);
-
-        final Optional<PkgmSubscription> optionalEtsiCatalogManagerSubscription =
-                etsiCatalogServiceProvider.postSubscription(etsiCatalogManagerSubscriptionRequest);
-
-        if (optionalEtsiCatalogManagerSubscription.isPresent()) {
-            final PkgmSubscription etsiCatalogManagerSubscription = optionalEtsiCatalogManagerSubscription.get();
-            logger.debug("postPkgmSubscriptionRequest Response SubscriptionId: {}",
-                    Objects.requireNonNull(etsiCatalogManagerSubscription.getId()));
-            final String subscriptionId = etsiCatalogManagerSubscription.getId();
-
-            packageManagementCacheServiceProvider.addSubscription(subscriptionId, pkgmSubscriptionRequest);
-
-            final InlineResponse201 response = new InlineResponse201();
-            response.setId(subscriptionId);
-            response.setFilter(pkgmSubscriptionRequest.getFilter());
-            response.setCallbackUri(vnfmAdapterUrlProvider.getSubscriptionUriString(subscriptionId));
-            response.setLinks(new SubscriptionsLinks()
-                    .self(new VnfPackagesLinksSelf().href(getSubscriptionUri(subscriptionId).toString())));
-
-            return Optional.of(response);
-        }
-        throw new InternalServerErrorException(
-                "Received empty response from POST to ETSI Catalog Manager Subscription Endpoint.");
-    }
-
-    public Optional<String> getSubscriptionId(final PkgmSubscriptionRequest pkgmSubscriptionRequest) {
-        return packageManagementCacheServiceProvider.getSubscriptionId(pkgmSubscriptionRequest);
-    }
-
-    public Optional<InlineResponse201> getSubscription(final String subscriptionId) {
-
-        logger.debug("Checking if subscrition with id: {} exists in ETSI Catalog Manager", subscriptionId);
-        final Optional<NsdmSubscription> etsiCatalogSubscriptionOption =
-                etsiCatalogServiceProvider.getSubscription(subscriptionId);
-
-        if (!etsiCatalogSubscriptionOption.isPresent()) {
-            logger.debug("Unable to find subscription in ETSI Catalog Manager using id: {}", subscriptionId);
-            if (packageManagementCacheServiceProvider.getSubscription(subscriptionId).isPresent()) {
-                logger.debug("will remove subcription with id: {} from local cache", subscriptionId);
-                packageManagementCacheServiceProvider.deleteSubscription(subscriptionId);
-            }
-        }
-
-        final Optional<PkgmSubscriptionRequest> optional =
-                packageManagementCacheServiceProvider.getSubscription(subscriptionId);
-        if (optional.isPresent()) {
-            final PkgmSubscriptionRequest subscription = optional.get();
-            return Optional.of(getInlineResponse2002(subscriptionId, subscription));
-        }
-        return Optional.empty();
-    }
-
-    public List<InlineResponse201> getSubscriptions() {
-        final Map<String, PkgmSubscriptionRequest> subscriptions =
-                packageManagementCacheServiceProvider.getSubscriptions();
-        final List<InlineResponse201> response = new ArrayList<>();
-        subscriptions.forEach((key, value) -> {
-            final Optional<InlineResponse201> optional = getSubscription(key);
-            if (optional.isPresent()) {
-                response.add(optional.get());
-            }
-        });
-        return response;
-    }
-
-    public boolean deleteSubscription(final String subscriptionId) {
-        if (packageManagementCacheServiceProvider.getSubscription(subscriptionId).isPresent()) {
-            try {
-                if (etsiCatalogServiceProvider.deleteSubscription(subscriptionId)) {
-                    return packageManagementCacheServiceProvider.deleteSubscription(subscriptionId);
-                }
-            } catch (final SubscriptionNotFoundException subscriptionNotFoundException) {
-                logger.error(
-                        "Unable to find subscription in ETSI Catalog Manager using id: {} will delete it from local cache",
-                        subscriptionId);
-                return packageManagementCacheServiceProvider.deleteSubscription(subscriptionId);
-            }
-        }
-        return false;
-    }
-
-    public URI getSubscriptionUri(final String subscriptionId) {
-        return vnfmAdapterUrlProvider.getSubscriptionUri(subscriptionId);
-    }
-
-    public Optional<PkgmSubscriptionRequest> getSubscriptionRequest(final String subscriptionId) {
-        return packageManagementCacheServiceProvider.getSubscription(subscriptionId);
-    }
-
-    private InlineResponse201 getInlineResponse2002(final String id, final PkgmSubscriptionRequest subscription) {
-        return new InlineResponse201().id(id).filter(subscription.getFilter())
-                .callbackUri(subscription.getCallbackUri());
-    }
-
-    private org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest buildEtsiCatalogManagerPkgmSubscriptionRequest(
-            final PkgmSubscriptionRequest pkgmSubscriptionRequest) throws GeneralSecurityException {
-
-        final org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest etsiCatalogManagerSubscriptionRequest;
-        try {
-            etsiCatalogManagerSubscriptionRequest = conversionService.convert(pkgmSubscriptionRequest,
-                    org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest.class);
-        } catch (final org.springframework.core.convert.ConversionException conversionException) {
-            logger.error(conversionException.getMessage());
-            throw new ConversionFailedException(
-                    "Could not convert Sol003 PkgmSubscriptionRequest to ETSI-Catalog Manager PkgmSubscriptionRequest");
-        } catch (final Exception exception) {
-            logger.error(exception.getMessage());
-            throw new InternalServerErrorException(
-                    "Could not convert Sol003 PkgmSubscriptionRequest to ETSI-Catalog Manager PkgmSubscriptionRequest");
-        }
-
-        if (etsiCatalogManagerSubscriptionRequest != null) {
-            etsiCatalogManagerSubscriptionRequest
-                    .setCallbackUri(vnfmAdapterUrlProvider.getEtsiSubscriptionNotificationBaseUrl());
-
-            final ImmutablePair<String, String> immutablePair = vnfmAdapterUrlProvider.getDecryptAuth();
-            if (!immutablePair.equals(ImmutablePair.nullPair())) {
-                etsiCatalogManagerSubscriptionRequest.setAuthentication(
-                        new org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.SubscriptionAuthentication()
-                                .addAuthTypeItem(BASIC).paramsBasic(new BasicAuth().userName(immutablePair.getLeft())
-                                        .password(immutablePair.getRight())));
-            }
-            return etsiCatalogManagerSubscriptionRequest;
-        }
-        throw new ConversionFailedException(
-                "Failed to convert Sol003 PkgmSubscriptionRequest to ETSI-Catalog Manager PkgmSubscriptionRequest");
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/TlsNotificationServiceProvider.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/TlsNotificationServiceProvider.java
deleted file mode 100644
index 69ff5da3ec..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/pkgm/subscriptionmgmt/TlsNotificationServiceProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-package org.onap.so.adapters.etsisol003adapter.pkgm.subscriptionmgmt;
-
-import static org.slf4j.LoggerFactory.getLogger;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication.AuthTypeEnum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.rest.exceptions.AuthenticationTypeNotSupportedException;
-import org.slf4j.Logger;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * @author Waqas Ikram (waqas.ikram@est.tech)
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- */
-@Service
-public class TlsNotificationServiceProvider extends AbstractNotificationServiceProvider
-        implements NotificationServiceProvider {
-
-    private static final Logger logger = getLogger(TlsNotificationServiceProvider.class);
-
-    @Override
-    public boolean send(final Object notification, final SubscriptionsAuthentication subscriptionsAuthentication,
-            final String callbackUri) {
-        final String errorMessage = "An error occurred.  Authentication type "
-                + subscriptionsAuthentication.getAuthType().toString() + " not currently supported.";
-        logger.error(errorMessage);
-        throw new AuthenticationTypeNotSupportedException(errorMessage);
-    }
-
-
-    @Override
-    public AuthTypeEnum getAuthType() {
-        return AuthTypeEnum.TLS_CERT;
-    }
-
-
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationControllerTest.java
deleted file mode 100644
index efe6891f1e..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/EtsiSubscriptionNotificationControllerTest.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL;
-import static org.onap.so.client.RestTemplateConfig.CONFIGURABLE_REST_TEMPLATE;
-import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_CLASS;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-import java.net.URI;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.NOTIFICATIONLINKSERIALIZER;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model.PkgmLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.JSON;
-import org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageChangeNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model.VnfPackageOnboardingNotification;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthenticationParamsBasic;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthenticationParamsOauth2ClientCredentials;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.converter.json.GsonHttpMessageConverter;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * @author Andrew Lamb (andrew.a.lamb@est.tech)
- *
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-@DirtiesContext(classMode = BEFORE_CLASS)
-public class EtsiSubscriptionNotificationControllerTest {
-
-    @LocalServerPort
-    private int port;
-
-    private static final URI CALLBACK_URI = URI.create("http://test_callback_uri/notification");
-    private static final String TOKEN_ENDPOINT = "http://test_token_endpoint_uri/";
-    private static final String TOKEN = "dXNlcm5hbWU6cGFzc3dvcmQ=......";
-    private static final String JSON_TOKEN = "{\"access_token\":\"" + TOKEN + "\"}";
-    private static final String LOCALHOST_URL = "http://localhost:";
-    private static final String NOTIFICATION_BASE_URL =
-            ETSI_SUBSCRIPTION_NOTIFICATION_CONTROLLER_BASE_URL + "/notification";
-    private static final String USERNAME = "username";
-    private static final String PASSWORD = "password";
-    private static final String EXPECTED_BASIC_AUTHORIZATION = "Basic dXNlcm5hbWU6cGFzc3dvcmQ=";
-    private static final String EXPECTED_OAUTH_AUTHORIZATION = "Bearer " + TOKEN;
-    private static final String NOTIFICATION_ID = "NOTIFICATION_ID";
-    private static final String SUBSCRIPTION_ID = "SUBSCRIPTION_ID";
-    private static final String TIME_STAMP_STRING_EXPECTED_FROM_ETSI_CATALOG = "2020-01-01 01:01:01";
-    private static final java.time.LocalDateTime TIMESTAMP = java.time.LocalDateTime.of(2020, 1, 1, 1, 1, 1, 1);
-    private static final String VNFPKG_ID = UUID.randomUUID().toString();
-    private static final String VNFD_ID = UUID.randomUUID().toString();
-    private static final String EXPECTED_VNF_PACKAGE_HREF =
-            "https://so-vnfm-adapter.onap:30406/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/" + VNFPKG_ID;
-    private static final String EXPECTED_SUBSCRIPTION_HREF =
-            "https://so-vnfm-adapter.onap:30406/so/vnfm-adapter/v1/vnfpkgm/v1/subscriptions/" + SUBSCRIPTION_ID;
-
-
-    private BasicHttpHeadersProvider basicHttpHeadersProvider;
-
-    @Autowired
-    @Qualifier(CONFIGURABLE_REST_TEMPLATE)
-    private RestTemplate restTemplate;
-    private MockRestServiceServer mockRestServiceServer;
-
-    private TestRestTemplate testRestTemplate;
-
-    @Autowired
-    private CacheManager cacheServiceProvider;
-    private Cache cache;
-
-    @Before
-    public void setUp() {
-        mockRestServiceServer = MockRestServiceServer.bindTo(restTemplate).build();
-        basicHttpHeadersProvider = new BasicHttpHeadersProvider();
-        cache = cacheServiceProvider.getCache(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE);
-        cache.clear();
-
-        final Gson gson = JSON.createGson().registerTypeAdapter(LocalDateTime.class,
-                new EtsiSubscriptionNotificationController.LocalDateTimeTypeAdapter()).create();
-        testRestTemplate = new TestRestTemplate(
-                new RestTemplateBuilder().additionalMessageConverters(new GsonHttpMessageConverter(gson)));
-    }
-
-
-    @After
-    public void tearDown() {
-        mockRestServiceServer.reset();
-        cache.clear();
-    }
-
-    @Test
-    public void testSubscriptionNotificationEndPoint_ReturnsNoContent() {
-        final ResponseEntity<?> response = sendHttpGet(NOTIFICATION_BASE_URL);
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void testOnboardingNotificationSentOnToVnfmCallbackUri_SubscriptionRequestInCache_Success() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andExpect(jsonPath("$.id").value(NOTIFICATION_ID))
-                .andExpect(jsonPath("$.notificationType")
-                        .value(VnfPackageOnboardingNotification.NotificationTypeEnum.VNFPACKAGEONBOARDINGNOTIFICATION
-                                .toString()))
-                .andExpect(jsonPath("$.subscriptionId").value(SUBSCRIPTION_ID))
-                .andExpect(jsonPath("$.timeStamp").value(TIME_STAMP_STRING_EXPECTED_FROM_ETSI_CATALOG))
-                .andExpect(jsonPath("$.vnfPkgId").value(VNFPKG_ID)).andExpect(jsonPath("$.vnfdId").value(VNFD_ID))
-                .andExpect(jsonPath("$._links")
-                        .value(buildPkgmLinks(EXPECTED_VNF_PACKAGE_HREF, EXPECTED_SUBSCRIPTION_HREF)))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION)).andRespond(withSuccess());
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void testOnboardingNotificationNotSentOnToVnfmCallbackUri_SubscriptionRequestNotInCache_Fail() {
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "No subscription found with subscriptionId " + SUBSCRIPTION_ID
-                + ". Unable to forward notification to subscriber.";
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testOnboardingNotificationSentOnToVnfmCallbackUri_BadRequestResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.BAD_REQUEST + ".\n" + "No result found for given url: " + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testOnboardingNotificationSentOnToVnfmCallbackUri_301MovedPermanentlyResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.MOVED_PERMANENTLY));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed.";
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testOnboardingNotificationSentOnToVnfmCallbackUri_NotFoundResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.NOT_FOUND + ".\n" + "No result found for given url: " + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testOnboardingNotificationSentOnToVnfmCallbackUri_InternalServerErrorResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.INTERNAL_SERVER_ERROR.value() + ".\n" + "Unable to invoke HTTP POST using URL: "
-                + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testChangeNotificationSentOnToVnfmCallbackUri_SubscriptionRequestInCache_Success() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andExpect(jsonPath("$.id").value(NOTIFICATION_ID))
-                .andExpect(jsonPath("$.notificationType").value(
-                        VnfPackageChangeNotification.NotificationTypeEnum.VNFPACKAGECHANGENOTIFICATION.getValue()))
-                .andExpect(jsonPath("$.subscriptionId").value(SUBSCRIPTION_ID))
-                .andExpect(jsonPath("$.timeStamp").value(TIME_STAMP_STRING_EXPECTED_FROM_ETSI_CATALOG))
-                .andExpect(jsonPath("$.vnfPkgId").value(VNFPKG_ID)).andExpect(jsonPath("$.vnfdId").value(VNFD_ID))
-                .andExpect(
-                        jsonPath("$.changeType").value(PkgChangeNotification.ChangeTypeEnum.OP_STATE_CHANGE.toString()))
-                .andExpect(jsonPath("$.operationalState")
-                        .value(PkgChangeNotification.OperationalStateEnum.ENABLED.toString()))
-                .andExpect(jsonPath("$._links")
-                        .value(buildPkgmLinks(EXPECTED_VNF_PACKAGE_HREF, EXPECTED_SUBSCRIPTION_HREF)))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION)).andRespond(withSuccess());
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void testChangeNotificationNotSentOnToVnfmCallbackUri_SubscriptionRequestNotInCache_Fail() {
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "No subscription found with subscriptionId " + SUBSCRIPTION_ID
-                + ". Unable to forward notification to subscriber.";
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testChangeNotificationSentOnToVnfmCallbackUri_BadRequestResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.BAD_REQUEST + ".\n" + "No result found for given url: " + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testChangeNotificationSentOnToVnfmCallbackUri_NotFoundResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.NOT_FOUND + ".\n" + "No result found for given url: " + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testChangeNotificationSentOnToVnfmCallbackUri_InternalServerErrorResponseFromCallbackUri_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.INTERNAL_SERVER_ERROR.value() + ".\n" + "Unable to invoke HTTP POST using URL: "
-                + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testNotificationSentOnToVnfm_BasicAuthUserPasswordAuthorized_Success() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgOnboardingNotification notification = buildPkgOnboardingNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andExpect(jsonPath("$.id").value(NOTIFICATION_ID))
-                .andExpect(jsonPath("$.notificationType")
-                        .value(VnfPackageOnboardingNotification.NotificationTypeEnum.VNFPACKAGEONBOARDINGNOTIFICATION
-                                .toString()))
-                .andExpect(jsonPath("$.subscriptionId").value(SUBSCRIPTION_ID))
-                .andExpect(jsonPath("$.timeStamp").value(TIME_STAMP_STRING_EXPECTED_FROM_ETSI_CATALOG))
-                .andExpect(jsonPath("$.vnfPkgId").value(VNFPKG_ID)).andExpect(jsonPath("$.vnfdId").value(VNFD_ID))
-                .andExpect(jsonPath("$._links")
-                        .value(buildPkgmLinks(EXPECTED_VNF_PACKAGE_HREF, EXPECTED_SUBSCRIPTION_HREF)))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION)).andRespond(withSuccess());
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void testNotificationSentOnToVnfm_BasicAuthUserPasswordNotAuthorized_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.BASIC);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION))
-                .andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Sending of notification to VNFM failed with response: "
-                + HttpStatus.UNAUTHORIZED.value() + ".\n" + "Unable to invoke HTTP POST using URL: " + CALLBACK_URI;
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testNotificationSentOnToVnfm_OAuthAuthorized_Success() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(TOKEN_ENDPOINT)).andExpect(method(HttpMethod.POST))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION))
-                .andRespond(withSuccess(JSON_TOKEN, MediaType.APPLICATION_JSON));
-
-        mockRestServiceServer.expect(requestTo(CALLBACK_URI)).andExpect(method(HttpMethod.POST))
-                .andExpect(header("Authorization", EXPECTED_OAUTH_AUTHORIZATION))
-                .andExpect(jsonPath("$.id").value(NOTIFICATION_ID))
-                .andExpect(jsonPath("$.notificationType").value(
-                        VnfPackageChangeNotification.NotificationTypeEnum.VNFPACKAGECHANGENOTIFICATION.toString()))
-                .andExpect(jsonPath("$.subscriptionId").value(SUBSCRIPTION_ID))
-                .andExpect(jsonPath("$.timeStamp").value(TIME_STAMP_STRING_EXPECTED_FROM_ETSI_CATALOG))
-                .andExpect(jsonPath("$.vnfPkgId").value(VNFPKG_ID)).andExpect(jsonPath("$.vnfdId").value(VNFD_ID))
-                .andExpect(
-                        jsonPath("$.changeType").value(PkgChangeNotification.ChangeTypeEnum.OP_STATE_CHANGE.toString()))
-                .andExpect(jsonPath("$.operationalState")
-                        .value(PkgChangeNotification.OperationalStateEnum.ENABLED.toString()))
-                .andExpect(jsonPath("$._links")
-                        .value(buildPkgmLinks(EXPECTED_VNF_PACKAGE_HREF, EXPECTED_SUBSCRIPTION_HREF)))
-                .andRespond(withSuccess());
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    }
-
-    @Test
-    public void testNotificationSentOnToVnfm_OAuthTokenNotReceived_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        mockRestServiceServer.expect(requestTo(TOKEN_ENDPOINT)).andExpect(method(HttpMethod.POST))
-                .andExpect(header("Authorization", EXPECTED_BASIC_AUTHORIZATION)).andRespond(withSuccess());
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Unable to retrieve OAuth Token from VNFM for notification.";
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    @Test
-    public void testNotificationSentOnToVnfm_TLSCertNotYetSupported_Fail() {
-        final PkgmSubscriptionRequest subscriptionRequest =
-                buildPkgmSubscriptionRequest(SubscriptionsAuthentication.AuthTypeEnum.TLS_CERT);
-        cache.put(SUBSCRIPTION_ID, subscriptionRequest);
-        final PkgChangeNotification notification = buildPkgChangeNotification();
-
-        final ResponseEntity<?> response = sendHttpPost(notification);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-
-        final ProblemDetails problemDetails = (ProblemDetails) response.getBody();
-        final String errorMessage = "An error occurred.  Authentication type "
-                + subscriptionRequest.getAuthentication().getAuthType().toString() + " not currently supported.";
-
-        assertEquals(errorMessage, problemDetails.getDetail());
-    }
-
-    private PkgOnboardingNotification buildPkgOnboardingNotification() {
-        final PkgOnboardingNotification notification = new PkgOnboardingNotification();
-        notification.setId(NOTIFICATION_ID);
-        notification
-                .setNotificationType(PkgOnboardingNotification.NotificationTypeEnum.VNFPACKAGEONBOARDINGNOTIFICATION);
-        notification.setSubscriptionId(SUBSCRIPTION_ID);
-        notification.setTimeStamp(TIMESTAMP);
-        notification.setVnfPkgId(VNFPKG_ID);
-        notification.setVnfdId(VNFD_ID);
-        notification.setLinks(buildPkgmLinks());
-        return notification;
-    }
-
-    private PkgChangeNotification buildPkgChangeNotification() {
-        final PkgChangeNotification notification = new PkgChangeNotification();
-        notification.setId(NOTIFICATION_ID);
-        notification.setNotificationType(PkgChangeNotification.NotificationTypeEnum.VNFPACKAGECHANGENOTIFICATION);
-        notification.setSubscriptionId(SUBSCRIPTION_ID);
-        notification.setTimeStamp(TIMESTAMP);
-        notification.setVnfPkgId(VNFPKG_ID);
-        notification.setVnfdId(VNFD_ID);
-        notification.setChangeType(PkgChangeNotification.ChangeTypeEnum.OP_STATE_CHANGE);
-        notification.setOperationalState(PkgChangeNotification.OperationalStateEnum.ENABLED);
-        notification.setLinks(buildPkgmLinks());
-        return notification;
-    }
-
-    private PkgmLinks buildPkgmLinks() {
-        return buildPkgmLinks("vnf_package_href", "subscription_href");
-    }
-
-    private PkgmLinks buildPkgmLinks(final String vnfPkgHref, final String subscriptionHref) {
-        return new PkgmLinks().vnfPackage(new NOTIFICATIONLINKSERIALIZER().href(vnfPkgHref))
-                .subscription(new NOTIFICATIONLINKSERIALIZER().href(subscriptionHref));
-    }
-
-    private PkgmSubscriptionRequest buildPkgmSubscriptionRequest(
-            final SubscriptionsAuthentication.AuthTypeEnum authTypeEnum) {
-        final PkgmSubscriptionRequest subscriptionRequest = new PkgmSubscriptionRequest();
-        subscriptionRequest.setCallbackUri(CALLBACK_URI.toString());
-        subscriptionRequest.setAuthentication(buildSubscriptionsAuthentication(authTypeEnum));
-        return subscriptionRequest;
-    }
-
-    // TODO update for auth types other than basicAuth
-    private SubscriptionsAuthentication buildSubscriptionsAuthentication(
-            final SubscriptionsAuthentication.AuthTypeEnum authTypeEnum) {
-        final SubscriptionsAuthentication subscriptionsAuthentication = new SubscriptionsAuthentication();
-        final List<SubscriptionsAuthentication.AuthTypeEnum> authTypes = new ArrayList<>();
-        authTypes.add(authTypeEnum);
-        subscriptionsAuthentication.setAuthType(authTypes);
-        if (authTypeEnum == SubscriptionsAuthentication.AuthTypeEnum.TLS_CERT) {
-            // TODO: remove basic params and code for TLS
-            final SubscriptionsAuthenticationParamsBasic basicParams =
-                    new SubscriptionsAuthenticationParamsBasic().userName(USERNAME).password(PASSWORD);
-            subscriptionsAuthentication.setParamsBasic(basicParams);
-        } else if (authTypeEnum == SubscriptionsAuthentication.AuthTypeEnum.OAUTH2_CLIENT_CREDENTIALS) {
-            final SubscriptionsAuthenticationParamsOauth2ClientCredentials oathParams =
-                    new SubscriptionsAuthenticationParamsOauth2ClientCredentials().clientId(USERNAME)
-                            .clientPassword(PASSWORD).tokenEndpoint(TOKEN_ENDPOINT);
-            subscriptionsAuthentication.setParamsOauth2ClientCredentials(oathParams);
-        } else {
-            final SubscriptionsAuthenticationParamsBasic basicParams =
-                    new SubscriptionsAuthenticationParamsBasic().userName(USERNAME).password(PASSWORD);
-            subscriptionsAuthentication.setParamsBasic(basicParams);
-        }
-
-        return subscriptionsAuthentication;
-    }
-
-    private <T> ResponseEntity<ProblemDetails> sendHttpPost(final T notification) {
-        final String testURL = LOCALHOST_URL + port + NOTIFICATION_BASE_URL;
-        final HttpEntity<?> request = new HttpEntity<>(notification, basicHttpHeadersProvider.getHttpHeaders());
-        return testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.POST, request,
-                ProblemDetails.class);
-    }
-
-    private ResponseEntity<Void> sendHttpGet(final String url) {
-        final String testURL = LOCALHOST_URL + port + url;
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        return testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.GET, request, Void.class);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementControllerTest.java
deleted file mode 100644
index 10e4ea3a58..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementControllerTest.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.PACKAGE_MANAGEMENT_BASE_URL;
-import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProviderConfiguration.ETSI_CATALOG_REST_TEMPLATE_BEAN;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.Checksum;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.UriLink;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VNFPKGMLinkSerializer;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPackageArtifactInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPackageSoftwareImageInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfPkgInfo;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2001;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesLinks;
-import org.onap.so.configuration.rest.BasicHttpHeadersProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * @author gareth.roper@est.tech
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class Sol003PackageManagementControllerTest {
-
-    @LocalServerPort
-    private int port;
-
-    @Autowired
-    @Qualifier(ETSI_CATALOG_REST_TEMPLATE_BEAN)
-    private RestTemplate restTemplate;
-
-    @Autowired
-    private TestRestTemplate testRestTemplate;
-
-    private static final String VNF_PACKAGE_ID = "myVnfPackageId";
-    private static final String ARTIFACT_PATH = "myArtifactPath";
-    private static final String MSB_BASE_URL = "http://msb-iag.onap:80/api/vnfpkgm/v1/vnf_packages";
-    private static final String VNFPKGM_BASE_URL = PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages";
-    private static final String localhostUrl = "http://localhost:";
-    private static final String GET_VNF_PACKAGES_URL = "";
-    private static final String GET_VNF_PACKAGE_BY_ID_URL = "/" + VNF_PACKAGE_ID;
-    private static final String VNFD_ID = "vnfdId";
-    private static final String VNF_PROVIDER = "vnfProvider";
-    private static final String VNF_PRODUCT_NAME = "vnfProductName";
-    private static final String VNF_SOFTWARE_VERSION = "vnfSoftwareVersion";
-    private static final String VNFD_VERSION = "vnfdVersion";
-    private static final String ALGORITHM = "algorithm";
-    private static final String HASH = "hash";
-    private static final String EXPECTED_BASE_URL =
-            "https://so-vnfm-adapter.onap:30406/so/vnfm-adapter/v1/vnfpkgm/v1/vnf_packages/";
-    private static final String EXPECTED_SELF_HREF = EXPECTED_BASE_URL + VNF_PACKAGE_ID;
-    private static final String EXPECTED_VNFD_HREF = EXPECTED_BASE_URL + VNF_PACKAGE_ID + "/vnfd";
-    private static final String EXPECTED_PACKAGE_CONTENT_HREF = EXPECTED_BASE_URL + VNF_PACKAGE_ID + "/package_content";
-
-    private MockRestServiceServer mockRestServiceServer;
-    private BasicHttpHeadersProvider basicHttpHeadersProvider;
-    private final Gson gson = new Gson();
-
-    public Sol003PackageManagementControllerTest() {}
-
-    @Before
-    public void setUp() {
-        final MockRestServiceServer.MockRestServiceServerBuilder builder = MockRestServiceServer.bindTo(restTemplate);
-        builder.ignoreExpectOrder(true);
-        mockRestServiceServer = builder.build();
-        basicHttpHeadersProvider = new BasicHttpHeadersProvider();
-    }
-
-    @After
-    public void after() {
-        mockRestServiceServer.reset();
-    }
-
-    @Test
-    public void testGetPackageContent_ValidArray_Success() {
-        final byte[] responseArray = buildByteArrayWithRandomData(10);
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(responseArray, MediaType.APPLICATION_OCTET_STREAM));
-
-        final String testURL = "http://localhost:" + port + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/"
-                + VNF_PACKAGE_ID + "/package_content";
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        final ResponseEntity<byte[]> responseEntity =
-                testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.GET, request, byte[].class);
-
-        assertEquals(byte[].class, responseEntity.getBody().getClass());
-        assertArrayEquals(responseEntity.getBody(), responseArray);
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_Conflict_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.CONFLICT));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.CONFLICT, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_NotFound_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_UnauthorizedClient_Fail() {
-        final String testURL = "http://localhost:" + port + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/"
-                + VNF_PACKAGE_ID + "/package_content";
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                testRestTemplate.exchange(testURL, HttpMethod.GET, request, ProblemDetails.class);
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_InternalServerError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_BadRequest_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageContent_UnauthorizedServer_InternalError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testGetPackageContent_SuccessResponseFromServerWithNullPackage_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/package_content"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withSuccess());
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/package_content");
-
-        assertEquals(ProblemDetails.class, responseEntity.getBody().getClass());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testGetPackageArtifact_ValidArray_Success() {
-        final byte[] responseArray = buildByteArrayWithRandomData(10);
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(responseArray, MediaType.APPLICATION_OCTET_STREAM));
-
-        final String testURL = "http://localhost:" + port + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/"
-                + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH;
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        final ResponseEntity<byte[]> responseEntity =
-                testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.GET, request, byte[].class);
-
-        assertEquals(byte[].class, responseEntity.getBody().getClass());
-        assertArrayEquals(responseEntity.getBody(), responseArray);
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_Conflict_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.CONFLICT));
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.CONFLICT, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_NotFound_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_UnauthorizedClient_Fail() {
-        final String testURL = "http://localhost:" + port + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/"
-                + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH;
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        final ResponseEntity<ProblemDetails> responseEntity =
-                testRestTemplate.exchange(testURL, HttpMethod.GET, request, ProblemDetails.class);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_InternalServerError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_BadRequest_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageArtifact_UnauthorizedServer_InternalError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testGetPackageArtifact_SuccessResponseFromServerWithNullPackage_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH))
-                .andExpect(method(HttpMethod.GET)).andRespond(withSuccess());
-
-        final ResponseEntity<ProblemDetails> responseEntity =
-                sendHttpRequest(VNF_PACKAGE_ID + "/artifacts/" + ARTIFACT_PATH);
-
-        assertNotNull(responseEntity.getBody());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testVnfPackagesReceivedAsInlineResponse2001ListIfGetVnfPackagesSuccessful() {
-        final VnfPkgInfo[] responses = createVnfPkgArray();
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(gson.toJson(responses), MediaType.APPLICATION_JSON));
-
-        final String testURL = localhostUrl + port + VNFPKGM_BASE_URL;
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-
-        final ResponseEntity<InlineResponse2001[]> responseEntity = testRestTemplate.withBasicAuth("test", "test")
-                .exchange(testURL, HttpMethod.GET, request, InlineResponse2001[].class);
-
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-        assertNotNull(responseEntity.getBody());
-        final InlineResponse2001[] inlineResponse2001array = responseEntity.getBody();
-        final InlineResponse2001 inlineResponse2001 = inlineResponse2001array[0];
-        assertEquals(VNF_PACKAGE_ID, inlineResponse2001.getId());
-        assertEquals(VNFD_ID, inlineResponse2001.getVnfdId());
-        assertEquals(VNFD_ID, inlineResponse2001.getSoftwareImages().get(0).getId());
-        assertEquals(VNF_PRODUCT_NAME, inlineResponse2001.getSoftwareImages().get(0).getName());
-        assertEquals(ALGORITHM, inlineResponse2001.getChecksum().getAlgorithm());
-        assertEquals(HASH, inlineResponse2001.getChecksum().getHash());
-        assertEquals(ARTIFACT_PATH, inlineResponse2001.getAdditionalArtifacts().get(0).getArtifactPath());
-        assertEquals(ALGORITHM, inlineResponse2001.getAdditionalArtifacts().get(0).getChecksum().getAlgorithm());
-        assertEquals(HASH, inlineResponse2001.getAdditionalArtifacts().get(0).getChecksum().getHash());
-        final VnfPackagesLinks links = inlineResponse2001.getLinks();
-        assertNotNull(links);
-        assertEquals(EXPECTED_SELF_HREF, links.getSelf().getHref());
-        assertEquals(EXPECTED_VNFD_HREF, links.getVnfd().getHref());
-        assertEquals(EXPECTED_PACKAGE_CONTENT_HREF, links.getPackageContent().getHref());
-    }
-
-    @Test
-    public void test400BadRequestInfoReceivedAsProblemDetailsIfGetVnfPackagesIs400BadRequest() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGES_URL);
-        assertEquals(HttpStatus.BAD_REQUEST, responseEntity.getStatusCode());
-
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("Error: Bad Request Received", problemDetails.getDetail());
-    }
-
-    @Test
-    public void test404NotFoundInfoReceivedAsProblemDetailsIfGetVnfPackagesIs404NotFound() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGES_URL);
-        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
-
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("No Vnf Packages found", problemDetails.getDetail());
-    }
-
-    @Test
-    public void test500InternalServerErrorProblemDetailsReceivedIfGetVnfPackagesReturns500InternalServerError() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGES_URL);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("Internal Server Error Occurred.", problemDetails.getDetail());
-    }
-
-    @Test
-    public void test500InternalServerErrorProblemDetailsReceivedIfGetVnfPackagesReturnsANullPackage() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess());
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGES_URL);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"vnf_packages\" \n"
-                + "endpoint.", problemDetails.getDetail());
-    }
-
-    @Test
-    public void testVnfPackageReceivedAsInlineResponse2001IfGetVnfPackageByIdSuccessful() {
-        final VnfPkgInfo response = createVnfPkgInfo(VNF_PACKAGE_ID);
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(gson.toJson(response), MediaType.APPLICATION_JSON));
-
-        final String testURL = localhostUrl + port + VNFPKGM_BASE_URL + "/" + VNF_PACKAGE_ID;
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        final ResponseEntity<InlineResponse2001> responseEntity = testRestTemplate.withBasicAuth("test", "test")
-                .exchange(testURL, HttpMethod.GET, request, InlineResponse2001.class);
-
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-        assertNotNull(responseEntity.getBody());
-        final InlineResponse2001 inlineResponse2001 = responseEntity.getBody();
-        assertEquals(VNF_PACKAGE_ID, inlineResponse2001.getId());
-        assertEquals(VNFD_ID, inlineResponse2001.getVnfdId());
-        assertEquals(VNFD_ID, inlineResponse2001.getSoftwareImages().get(0).getId());
-        assertEquals(VNF_PRODUCT_NAME, inlineResponse2001.getSoftwareImages().get(0).getName());
-        assertEquals(ALGORITHM, inlineResponse2001.getChecksum().getAlgorithm());
-        assertEquals(HASH, inlineResponse2001.getChecksum().getHash());
-        assertEquals(ARTIFACT_PATH, inlineResponse2001.getAdditionalArtifacts().get(0).getArtifactPath());
-        assertEquals(ALGORITHM, inlineResponse2001.getAdditionalArtifacts().get(0).getChecksum().getAlgorithm());
-        assertEquals(HASH, inlineResponse2001.getAdditionalArtifacts().get(0).getChecksum().getHash());
-        final VnfPackagesLinks links = inlineResponse2001.getLinks();
-        assertNotNull(links);
-        assertEquals(EXPECTED_SELF_HREF, links.getSelf().getHref());
-        assertEquals(EXPECTED_VNFD_HREF, links.getVnfd().getHref());
-        assertEquals(EXPECTED_PACKAGE_CONTENT_HREF, links.getPackageContent().getHref());
-
-    }
-
-    @Test
-    public void test400BadRequestInfoReceivedAsProblemDetailsIfGetVnfPackageByIdIs400BadRequest() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGE_BY_ID_URL);
-
-        assertEquals(HttpStatus.BAD_REQUEST, responseEntity.getStatusCode());
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("Error: Bad Request Received", problemDetails.getDetail());
-    }
-
-    @Test
-    public void test404NotFoundInfoReceivedAsProblemDetailsIfGetVnfPackageByIdIs404NotFound() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGE_BY_ID_URL);
-
-        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("No Vnf Package found with vnfPkgId: " + VNF_PACKAGE_ID, problemDetails.getDetail());
-    }
-
-    @Test
-    public void test500InternalServerErrorProblemDetailsReceivedIfGetVnfPackageByIdReturns500InternalServerError() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGE_BY_ID_URL);
-
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("Internal Server Error Occurred.", problemDetails.getDetail());
-    }
-
-    @Test
-    public void test500InternalServerErrorProblemDetailsReceivedIfGetVnfPackageByIdReturnsANullPackage() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess());
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(GET_VNF_PACKAGE_BY_ID_URL);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-
-        assertNotNull(responseEntity.getBody());
-        final ProblemDetails problemDetails = responseEntity.getBody();
-        assertEquals("An error occurred, a null response was received by the\n"
-                + " Sol003PackageManagementController from the EtsiCatalogManager using the GET \"vnf_packages\" by vnfPkgId: \""
-                + VNF_PACKAGE_ID + "\" \n" + "endpoint.", problemDetails.getDetail());
-    }
-
-    // The below test method is here to improve code coverage and provide a foundation for writing
-    // future tests
-    @Test
-    public void testGetPackageVnfd_ValidArray_Success() {
-        final byte[] responseArray = buildByteArrayWithRandomData(10);
-
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(responseArray, MediaType.APPLICATION_OCTET_STREAM));
-
-        final String testURL =
-                "http://localhost:" + port + PACKAGE_MANAGEMENT_BASE_URL + "/vnf_packages/" + VNF_PACKAGE_ID + "/vnfd";
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        final ResponseEntity<byte[]> responseEntity =
-                testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.GET, request, byte[].class);
-
-        assertEquals(byte[].class, responseEntity.getBody().getClass());
-        assertArrayEquals(responseEntity.getBody(), responseArray);
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_Conflict_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.CONFLICT));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.CONFLICT, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_NotFound_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.NOT_FOUND, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_UnauthorizedClient_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_InternalServerError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_BadRequest_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.BAD_REQUEST));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testOnGetPackageVnfd_UnauthorizedServer_InternalError_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withStatus(HttpStatus.UNAUTHORIZED));
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertTrue(responseEntity.getBody() instanceof ProblemDetails);
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    @Test
-    public void testGetPackageVnfd_SuccessResponseFromServerWithNullPackage_Fail() {
-        mockRestServiceServer.expect(requestTo(MSB_BASE_URL + "/" + VNF_PACKAGE_ID + "/vnfd"))
-                .andExpect(method(HttpMethod.GET)).andRespond(withSuccess());
-
-        final ResponseEntity<ProblemDetails> responseEntity = sendHttpRequest(VNF_PACKAGE_ID + "/vnfd");
-
-        assertEquals(ProblemDetails.class, responseEntity.getBody().getClass());
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, responseEntity.getStatusCode());
-    }
-
-    // Simply returns a byte array filled with random data, for use in the tests.
-    private byte[] buildByteArrayWithRandomData(final int sizeInKb) {
-        final Random rnd = new Random();
-        final byte[] b = new byte[sizeInKb * 1024]; // converting kb to byte
-        rnd.nextBytes(b);
-        return b;
-    }
-
-    private ResponseEntity<ProblemDetails> sendHttpRequest(final String url) {
-        final String testURL = localhostUrl + port + VNFPKGM_BASE_URL + "/" + url;
-        final HttpEntity<?> request = new HttpEntity<>(basicHttpHeadersProvider.getHttpHeaders());
-        return testRestTemplate.withBasicAuth("test", "test").exchange(testURL, HttpMethod.GET, request,
-                ProblemDetails.class);
-    }
-
-    private VnfPkgInfo[] createVnfPkgArray() {
-        final VnfPkgInfo[] vnfPkgInfoArray = new VnfPkgInfo[1];
-        final VnfPkgInfo vnfPkgInfo = createVnfPkgInfo(VNF_PACKAGE_ID);
-        vnfPkgInfoArray[0] = vnfPkgInfo;
-        return vnfPkgInfoArray;
-    }
-
-    private VnfPkgInfo createVnfPkgInfo(final String vnfPackageId) {
-        final VnfPkgInfo vnfPkgInfo = new VnfPkgInfo();
-        vnfPkgInfo.setId(vnfPackageId);
-        vnfPkgInfo.setVnfdId(VNFD_ID);
-        vnfPkgInfo.setVnfProvider(VNF_PROVIDER);
-        vnfPkgInfo.setVnfProductName(VNF_PRODUCT_NAME);
-        vnfPkgInfo.setVnfSoftwareVersion(VNF_SOFTWARE_VERSION);
-        vnfPkgInfo.setVnfdVersion(VNFD_VERSION);
-        vnfPkgInfo.setChecksum(createVnfPkgChecksum());
-        vnfPkgInfo.setSoftwareImages(createSoftwareImages());
-        vnfPkgInfo.setAdditionalArtifacts(createAdditionalArtifacts());
-        vnfPkgInfo.setLinks(createVNFPKGMLinkSerializerLinks());
-        return vnfPkgInfo;
-    }
-
-    private Checksum createVnfPkgChecksum() {
-        final Checksum checksum = new Checksum();
-        checksum.setAlgorithm(ALGORITHM);
-        checksum.setHash(HASH);
-        return checksum;
-    }
-
-    private List<VnfPackageSoftwareImageInfo> createSoftwareImages() {
-        final List<VnfPackageSoftwareImageInfo> softwareImages = new ArrayList<>();
-        final VnfPackageSoftwareImageInfo vnfPackageSoftwareImageInfo = new VnfPackageSoftwareImageInfo();
-        vnfPackageSoftwareImageInfo.setId(VNFD_ID);
-        vnfPackageSoftwareImageInfo.setName(VNF_PRODUCT_NAME);
-        vnfPackageSoftwareImageInfo.setProvider("");
-        vnfPackageSoftwareImageInfo.setVersion("");
-        vnfPackageSoftwareImageInfo.setChecksum(createVnfPkgChecksum());
-        vnfPackageSoftwareImageInfo
-                .setContainerFormat(VnfPackageSoftwareImageInfo.ContainerFormatEnum.fromValue("AKI"));
-        softwareImages.add(vnfPackageSoftwareImageInfo);
-        return softwareImages;
-    }
-
-    private List<VnfPackageArtifactInfo> createAdditionalArtifacts() {
-        final List<VnfPackageArtifactInfo> vnfPackageArtifactInfos = new ArrayList<>();
-        final VnfPackageArtifactInfo vnfPackageArtifactInfo =
-                new VnfPackageArtifactInfo().artifactPath(ARTIFACT_PATH).checksum(createVnfPkgChecksum());
-        vnfPackageArtifactInfos.add(vnfPackageArtifactInfo);
-        return vnfPackageArtifactInfos;
-    }
-
-    private VNFPKGMLinkSerializer createVNFPKGMLinkSerializerLinks() {
-        final String baseUrl = "http://msb-iag:443/api/vnfpkgm/v1/vnf_packages";
-        return new VNFPKGMLinkSerializer().self(new UriLink().href(baseUrl + "/myVnfPackageId"))
-                .vnfd(new UriLink().href(baseUrl + "/myVnfPackageId/vnfd"))
-                .packageContent(new UriLink().href(baseUrl + "/myVnfPackageId/package_content"));
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionControllerTest.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionControllerTest.java
deleted file mode 100644
index 65be6a87f0..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/Sol003PackageManagementSubscriptionControllerTest.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL;
-import static org.onap.so.adapters.etsi.sol003.adapter.common.CommonConstants.PACKAGE_MANAGEMENT_BASE_URL;
-import static org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.EtsiCatalogServiceProviderConfiguration.ETSI_CATALOG_REST_TEMPLATE_BEAN;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
-import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.so.adapters.etsisol003adapter.pkgm.PackageManagementConstants;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.BasicAuth;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.LinkSelf;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.NsdmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmNotificationsFilter;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscription;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.ProblemDetails;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.SubscriptionAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.Version;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfProducts;
-import org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.VnfProductsProviders;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse2002;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.InlineResponse201;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.PkgmSubscriptionRequest;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsAuthentication;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilter1;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsFilterVnfProductsFromProviders;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.SubscriptionsLinks;
-import org.onap.so.adapters.etsisol003adapter.pkgm.model.VnfPackagesLinksSelf;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.test.web.client.match.MockRestRequestMatchers;
-import org.springframework.web.client.RestTemplate;
-import com.google.gson.Gson;
-
-/**
- * @author Ronan Kenny (ronan.kenny@est.tech)
- * @author Gareth Roper (gareth.roper@est.tech)
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-public class Sol003PackageManagementSubscriptionControllerTest {
-
-    private final Gson gson = new Gson();
-    private final URI msbEndpoint = URI.create("http://msb-iag.onap:80/api/vnfpkgm/v1/subscriptions");
-    private static final String _NOTIFICATION_CALLBACK_URI =
-            "https://so-vnfm-adapter.onap:30406" + ETSI_SUBSCRIPTION_NOTIFICATION_BASE_URL;
-    private static final String LOCALHOST_URL = "http://localhost:";
-
-    @Autowired
-    @Qualifier(ETSI_CATALOG_REST_TEMPLATE_BEAN)
-    private RestTemplate restTemplate;
-    private MockRestServiceServer mockRestServiceServer;
-    @Autowired
-    private CacheManager cacheServiceProvider;
-    @Autowired
-    private Sol003PackageManagementSubscriptionController sol003PackageManagementSubscriptionController;
-
-    @Autowired
-    private TestRestTemplate testRestTemplate;
-
-    @LocalServerPort
-    private int port;
-
-    private static final String ID = UUID.randomUUID().toString();
-
-    @Before
-    public void setUp() {
-        mockRestServiceServer = MockRestServiceServer.bindTo(restTemplate).build();
-        final Cache cache =
-                cacheServiceProvider.getCache(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE);
-        cache.clear();
-    }
-
-    @After
-    public void after() {
-        mockRestServiceServer.reset();
-    }
-
-    @Test
-    public void testSuccessPostSubscription() throws GeneralSecurityException, URISyntaxException {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = postSubscriptionForTest();
-        final ResponseEntity<InlineResponse201> response =
-                (ResponseEntity<InlineResponse201>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest);
-
-        final HttpHeaders headers = buildHttpHeaders(Objects.requireNonNull(response.getBody()).getCallbackUri());
-
-        final SubscriptionsLinks subscriptionsLinks = new SubscriptionsLinks();
-        final VnfPackagesLinksSelf vnfPackagesLinksSelf = new VnfPackagesLinksSelf();
-        vnfPackagesLinksSelf.setHref("https://so-vnfm-adapter.onap:30406" + PACKAGE_MANAGEMENT_BASE_URL
-                + "/subscriptions/" + response.getBody().getId());
-        subscriptionsLinks.setSelf(vnfPackagesLinksSelf);
-
-        assertEquals(pkgmSubscriptionRequest.getFilter(), response.getBody().getFilter());
-        assertEquals(subscriptionsLinks, response.getBody().getLinks());
-        assertEquals(response.getBody().getFilter(), pkgmSubscriptionRequest.getFilter());
-        assert (response.getHeaders().equals(headers));
-        assertThat(response.getStatusCode(), is(HttpStatus.CREATED));
-        assertNotNull(response.getBody().getCallbackUri());
-    }
-
-    @Test
-    public void testFailPostSubscriptionAlreadyExists() throws GeneralSecurityException {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = postSubscriptionForTest();
-
-        final ResponseEntity<InlineResponse2002> response =
-                (ResponseEntity<InlineResponse2002>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest);
-
-        // Create duplicate entry
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest2 = buildPkgmSubscriptionRequest();
-
-        final ResponseEntity<InlineResponse2002> response2002 =
-                (ResponseEntity<InlineResponse2002>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest2);
-
-        assertEquals(HttpStatus.SEE_OTHER, response2002.getStatusCode());
-    }
-
-    @Test
-    public void testSuccessGetSubscriptionWithSubscriptionId() throws GeneralSecurityException, URISyntaxException {
-
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = postSubscriptionForTest();
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(gson.toJson(new NsdmSubscription().id(ID)), MediaType.APPLICATION_JSON));
-
-        final ResponseEntity<InlineResponse201> response =
-                (ResponseEntity<InlineResponse201>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest);
-        final String subscriptionId = response.getBody().getId();
-
-
-
-        final ResponseEntity<InlineResponse201> responseEntity =
-                (ResponseEntity<InlineResponse201>) sol003PackageManagementSubscriptionController
-                        .getSubscription(subscriptionId);
-
-        final HttpHeaders headers = buildHttpHeaders(response.getBody().getCallbackUri());
-
-        assertEquals(response.getBody().getFilter(), pkgmSubscriptionRequest.getFilter());
-        assertEquals(response.getHeaders(), headers);
-        assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
-        assertEquals(pkgmSubscriptionRequest.getFilter(), response.getBody().getFilter());
-        // Ensure CallBackUri is set to new URI
-        assertNotEquals(pkgmSubscriptionRequest.getCallbackUri(), response.getBody().getCallbackUri());
-    }
-
-    @Test
-    public void testFailGetSubscriptionWithInvalidSubscriptionId() {
-        final String invalidId = "invalidSubscriptionId";
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + invalidId)).andExpect(method(HttpMethod.GET))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-        final ResponseEntity<?> response = sol003PackageManagementSubscriptionController.getSubscription(invalidId);
-        assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
-        assertTrue(response.getBody() instanceof ProblemDetails);
-    }
-
-    @Test
-    public void testSuccessGetSubscriptions() throws GeneralSecurityException {
-        final PkgmSubscription pkgmSubscription = buildPkgmSubscription();
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = buildPkgmSubscriptionRequest();
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint)).andExpect(method(HttpMethod.POST))
-                .andRespond(withSuccess(gson.toJson(pkgmSubscription), MediaType.APPLICATION_JSON));
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + ID)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(gson.toJson(new NsdmSubscription().id(ID)), MediaType.APPLICATION_JSON));
-
-        sol003PackageManagementSubscriptionController.postSubscriptionRequest(pkgmSubscriptionRequest);
-        final ResponseEntity<List<InlineResponse201>> response =
-                sol003PackageManagementSubscriptionController.getSubscriptions();
-
-        final List<InlineResponse201> subscriptionsList = response.getBody();
-
-        assertEquals(Objects.requireNonNull(response.getBody()).get(0).getFilter(),
-                pkgmSubscriptionRequest.getFilter());
-        assertNotNull(subscriptionsList != null);
-        assertNotEquals('0', subscriptionsList.size());
-        assertEquals(HttpStatus.OK, response.getStatusCode());
-    }
-
-    @Test
-    public void testSuccessDeleteSubscriptionWithSubscriptionId() throws GeneralSecurityException {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = buildPkgmSubscriptionRequest();
-        final PkgmSubscription pkgmSubscription = buildPkgmSubscription();
-        final String subscriptionId = pkgmSubscription.getId();
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint)).andExpect(method(HttpMethod.POST))
-                .andRespond(withSuccess(gson.toJson(pkgmSubscription), MediaType.APPLICATION_JSON));
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + subscriptionId)).andExpect(method(HttpMethod.DELETE))
-                .andRespond(withStatus(HttpStatus.NO_CONTENT));
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + subscriptionId)).andExpect(method(HttpMethod.GET))
-                .andRespond(withSuccess(gson.toJson(new NsdmSubscription().id(subscriptionId)),
-                        MediaType.APPLICATION_JSON));
-
-        final ResponseEntity<InlineResponse2002> responsePost =
-                (ResponseEntity<InlineResponse2002>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest);
-
-        final ResponseEntity responseDelete =
-                sol003PackageManagementSubscriptionController.deleteSubscription(subscriptionId);
-
-        // Attempt to retrieve the subscription after delete
-        final ResponseEntity<InlineResponse2002> responseGetSubscription =
-                (ResponseEntity<InlineResponse2002>) sol003PackageManagementSubscriptionController
-                        .getSubscription(subscriptionId);
-
-        assertEquals(HttpStatus.NOT_FOUND, responseGetSubscription.getStatusCode());
-        assertEquals(HttpStatus.NO_CONTENT, responseDelete.getStatusCode());
-    }
-
-    @Test
-    public void testDeleteSubscription_SubscripitonNotFoundInEtsiCatalogManager_SubscriptionDeletedFromLocalCache()
-            throws GeneralSecurityException {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = buildPkgmSubscriptionRequest();
-        final PkgmSubscription pkgmSubscription = buildPkgmSubscription();
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint)).andExpect(method(HttpMethod.POST))
-                .andRespond(withSuccess(gson.toJson(pkgmSubscription), MediaType.APPLICATION_JSON));
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint + "/" + ID)).andExpect(method(HttpMethod.DELETE))
-                .andRespond(withStatus(HttpStatus.NOT_FOUND));
-
-        final ResponseEntity<InlineResponse2002> responsePost =
-                (ResponseEntity<InlineResponse2002>) sol003PackageManagementSubscriptionController
-                        .postSubscriptionRequest(pkgmSubscriptionRequest);
-
-        final Cache cache =
-                cacheServiceProvider.getCache(PackageManagementConstants.PACKAGE_MANAGEMENT_SUBSCRIPTION_CACHE);
-        assertNotNull(cache.get(ID));
-
-        final ResponseEntity responseDelete = sol003PackageManagementSubscriptionController.deleteSubscription(ID);
-
-        assertEquals(HttpStatus.NO_CONTENT, responseDelete.getStatusCode());
-        assertNull(cache.get(ID));
-
-    }
-
-    @Test
-    public void testFailDeleteSubscriptionWithInvalidSubscriptionId() throws URISyntaxException, InterruptedException {
-        final ResponseEntity<Void> responseDelete = (ResponseEntity<Void>) sol003PackageManagementSubscriptionController
-                .deleteSubscription("invalidSubscriptionId");
-        assertEquals(HttpStatus.NOT_FOUND, responseDelete.getStatusCode());
-    }
-
-
-    @Test
-    public void testSuccessPostSubscriptionWithValidNotificationTypes() throws Exception {
-
-        final String file = getAbsolutePath("src/test/resources/requests/SubscriptionRequest.json");
-        final String json = new String(Files.readAllBytes(Paths.get(file)));
-        final PkgmSubscriptionRequest request = gson.fromJson(json, PkgmSubscriptionRequest.class);
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint)).andExpect(method(HttpMethod.POST))
-                .andExpect(MockRestRequestMatchers.content().json(gson.toJson(getEtsiCatalogPkgmSubscriptionRequest())))
-                .andRespond(withSuccess(gson.toJson(buildPkgmSubscription()), MediaType.APPLICATION_JSON));
-
-
-        final ResponseEntity<InlineResponse201> responseEntity =
-                testRestTemplate.postForEntity(LOCALHOST_URL + port + PACKAGE_MANAGEMENT_BASE_URL + "/subscriptions",
-                        request, InlineResponse201.class);
-
-        assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode());
-        assertTrue(responseEntity.hasBody());
-        final InlineResponse201 actual = responseEntity.getBody();
-        assertEquals(ID, actual.getId());
-
-
-    }
-
-    private org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest getEtsiCatalogPkgmSubscriptionRequest() {
-        return new org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model.PkgmSubscriptionRequest()
-                .filter(new PkgmNotificationsFilter()
-                        .addNotificationTypesItem(
-                                PkgmNotificationsFilter.NotificationTypesEnum.VNFPACKAGEONBOARDINGNOTIFICATION)
-                        .addVnfdIdItem("VNFDID").addVnfPkgIdItem("VNFPKGID")
-                        .addOperationalStateItem(PkgmNotificationsFilter.OperationalStateEnum.ENABLED)
-                        .addVnfProductsFromProvidersItem(new VnfProductsProviders().vnfProvider("EST")
-                                .addVnfProductsItem(new VnfProducts().vnfProductName("VnfProducts")
-                                        .addVersionsItem(new Version().vnfSoftwareVersion("vnfSoftwareVersion")
-                                                .addVnfdVersionsItem("version1")))))
-                .callbackUri(_NOTIFICATION_CALLBACK_URI).authentication(
-                        new SubscriptionAuthentication().addAuthTypeItem(SubscriptionAuthentication.AuthTypeEnum.BASIC)
-                                .paramsBasic(new BasicAuth().userName("vnfm").password("password1$")));
-    }
-
-    private PkgmSubscriptionRequest buildPkgmSubscriptionRequest() {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = new PkgmSubscriptionRequest();
-        final SubscriptionsFilter1 sub = buildSubscriptionsFilter();
-        final SubscriptionsAuthentication auth = new SubscriptionsAuthentication();
-        pkgmSubscriptionRequest.setFilter(sub);
-        pkgmSubscriptionRequest.setCallbackUri(msbEndpoint.toString());
-        pkgmSubscriptionRequest.setAuthentication(auth);
-        return pkgmSubscriptionRequest;
-    }
-
-    private SubscriptionsFilter1 buildSubscriptionsFilter() {
-        final SubscriptionsFilter1 sub = new SubscriptionsFilter1();
-        final List<String> vnfdIdList = new ArrayList<>();
-        final List<String> vnfPkgIdList = new ArrayList<>();
-        final List<SubscriptionsFilter1.NotificationTypesEnum> notificationTypes = new ArrayList<>();
-        final SubscriptionsFilterVnfProductsFromProviders subscriptionsFilterVnfProductsFromProviders =
-                new SubscriptionsFilterVnfProductsFromProviders();
-        final List<SubscriptionsFilterVnfProductsFromProviders> vnfProductsFromProviders = new ArrayList<>();
-
-        vnfProductsFromProviders.add(subscriptionsFilterVnfProductsFromProviders);
-        sub.setVnfdId(vnfdIdList);
-        sub.setNotificationTypes(notificationTypes);
-        sub.setVnfPkgId(vnfPkgIdList);
-        sub.setVnfProductsFromProviders(vnfProductsFromProviders);
-        return sub;
-    }
-
-    private PkgmSubscription buildPkgmSubscription() {
-        final PkgmSubscription pkgmSubscription = new PkgmSubscription();
-        final PkgmNotificationsFilter pkgmNotificationsFilter = new PkgmNotificationsFilter();
-        final LinkSelf linkSelf = new LinkSelf();
-
-        pkgmSubscription.setId(ID);
-        pkgmSubscription.setCallbackUri(msbEndpoint + "/" + pkgmSubscription.getId().toString());
-        pkgmSubscription.setFilter(pkgmNotificationsFilter);
-        pkgmSubscription.setLinks(linkSelf);
-        return pkgmSubscription;
-    }
-
-    private PkgmSubscriptionRequest postSubscriptionForTest() {
-        final PkgmSubscriptionRequest pkgmSubscriptionRequest = buildPkgmSubscriptionRequest();
-        final PkgmSubscription pkgmSubscription = buildPkgmSubscription();
-
-        mockRestServiceServer.expect(requestTo(msbEndpoint)).andExpect(method(HttpMethod.POST))
-                .andRespond(withSuccess(gson.toJson(pkgmSubscription), MediaType.APPLICATION_JSON));
-        return pkgmSubscriptionRequest;
-    }
-
-    private HttpHeaders buildHttpHeaders(final String uri) throws URISyntaxException {
-        final HttpHeaders headers = new HttpHeaders();
-        final URI myUri = new URI(uri);
-        headers.setLocation(myUri);
-        return headers;
-    }
-
-    private String getAbsolutePath(final String path) {
-        final File file = new File(path);
-        return file.getAbsolutePath();
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/TestApplication.java b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/TestApplication.java
deleted file mode 100755
index 33535523d6..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/java/org/onap/so/adapters/etsisol003adapter/pkgm/rest/TestApplication.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- * ================================================================================
- * 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.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.adapters.etsisol003adapter.pkgm.rest;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
-import org.springframework.cache.annotation.EnableCaching;
-
-@EnableCaching
-@SpringBootApplication(scanBasePackages = {"org.onap.so"})
-@EnableAutoConfiguration(exclude = {JacksonAutoConfiguration.class})
-public class TestApplication {
-
-    public static void main(final String[] args) {
-        new SpringApplication(TestApplication.class).run(args);
-    }
-
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/application.yaml b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/application.yaml
deleted file mode 100644
index cdb6662191..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/application.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright © 2019 Nordix Foundation
-#
-# 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.
-spring:
-  security:
-    usercredentials:
-      - username: test
-        password: '$2a$12$Zi3AuYcZoZO/gBQyUtST2.F5N6HqcTtaNci2Et.ufsQhski56srIu'
-        role: BPEL-Client
-      - username: vnfm
-        password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
-        role: BPEL-Client
-  main:
-    allow-bean-definition-overriding: true
-
-mso:
-  key: 07a7159d3bf51a0e53be7a8f89699be7
-
-aai:
-  auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
-  endpoint: https://aai.onap:8443
-  version: v15
-
-sdc:
-  username: sdcUser
-  password: sdcPassword
-  key: adadadadad
-  endpoint: http://sdc.onap/1234A
-
-
-vnfmadapter:
-  endpoint: https://so-vnfm-adapter.onap:30406
-
-  
-#Actuator
-management:
-  endpoints:
-    web:
-      base-path: /manage
-      exposure:
-        include: "*"
-  metrics:
-    se-global-registry: false
-    export:
-      prometheus:
-        enabled: true # Whether exporting of metrics to Prometheus is enabled.
-        step: 1m # Step size (i.e. reporting frequency) to use.
-
-etsi-catalog-manager:
-   vnfpkgm:
-      endpoint: http://msb-iag.onap:80/api/vnfpkgm/v1
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/requests/SubscriptionRequest.json b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/requests/SubscriptionRequest.json
deleted file mode 100644
index c38466f8e5..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-adapter/src/test/resources/requests/SubscriptionRequest.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "filter": 
-    {
-        "notificationTypes": [
-            "VnfPackageOnboardingNotification"
-        ],
-        "vnfProductsFromProviders": [
-            {
-                "vnfProvider": "EST",
-                "vnfProducts": [
-                    {
-                        "vnfProductName": "VnfProducts",
-                        "versions": [
-                            {
-                                "vnfSoftwareVersion": "vnfSoftwareVersion",
-                                "vnfdVersions": [
-                                    "version1"
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ],
-        "vnfdId": [
-            "VNFDID"
-        ],
-        "vnfPkgId": [
-            "VNFPKGID"
-        ],
-        "operationalState": ["ENABLED"]
-    },
-    "callbackUri": "http://so-vnfm-adapter:9093/api/vnfpkgm/v1/subscriptions",
-    "authentication": 
-    {
-        "authType": [
-            "BASIC"
-        ],
-        "paramsBasic": 
-        {
-            "userName": "vnfm",
-            "password": "vnfm"
-        }
-    }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml
deleted file mode 100644
index 6cc4386198..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-api</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter API</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>${version-swagger-codegen}</version>
-        <executions>
-          <execution>
-            <id>etsicatalog-notification-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/ETSI-Catalog-Notification-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/etsicatalog/notification</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.etsicatalog.notification.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-                <dateLibrary>java8-localdatetime</dateLibrary>
-              </configOptions>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sol003-vnf-packagemanagement-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/SOL003-VNFPackageManagement-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/sol003-vnf-packagemanagement</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.pkgm.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.pkgm.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.basedir}/target/generated-sources/etsicatalog/notification/src/gen/java/main</source>
-                <source>${project.basedir}/target/generated-sources/sol003-vnf-packagemanagement/src/gen/java/main</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                    <versionRange>[2.2.0,)</versionRange>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-scalars</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${oltu-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.gsonfire</groupId>
-      <artifactId>gson-fire</artifactId>
-      <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>adapter-rxjava2</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okio</groupId>
-      <artifactId>okio</artifactId>
-      <version>${okio-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/ETSI-Catalog-Notification-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/ETSI-Catalog-Notification-API.json
deleted file mode 100644
index 6db54435d2..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/ETSI-Catalog-Notification-API.json
+++ /dev/null
@@ -1,279 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Modeling etsicatalog API",
-    "description": "\n\nThe `swagger-ui` view can be found [here](/api/catalog/v1/swagger).\nThe `ReDoc` view can be found [here](/api/catalog/v1/redoc).\nThe swagger YAML document can be found [here](/api/catalog/v1/swagger.yaml).\nThe swagger JSON document can be found [here](/api/catalog/v1/swagger.json).",
-    "version": "v1"
-  },
-  "host": "127.0.0.1:8000",
-  "schemes": [
-    "http"
-  ],
-  "basePath": "/",
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "securityDefinitions": {
-    "Basic": {
-      "type": "basic"
-    }
-  },
-  "security": [
-    {
-      "Basic": []
-    }
-  ],
-  "paths": {
-    "/URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageChangeNotification": {
-      "get": {
-        "operationId": "URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageChangeNotification_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": ""
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": [
-          "VNF Package Management interface"
-        ]
-      },
-      "post": {
-        "operationId": "URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageChangeNotification_create",
-        "description": "",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PkgChangeNotification"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": ""
-          }
-        },
-        "tags": [
-          "VNF Package Management interface"
-        ]
-      },
-      "parameters": []
-    },
-    "/URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageOnboardingNotification": {
-      "get": {
-        "operationId": "URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageOnboardingNotification_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": ""
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": [
-          "VNF Package Management interface"
-        ]
-      },
-      "post": {
-        "operationId": "URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageOnboardingNotification_create",
-        "description": "",
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/PkgOnboardingNotification"
-            }
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": ""
-          }
-        },
-        "tags": [
-          "VNF Package Management interface"
-        ]
-      },
-      "parameters": []
-    }
-  },
-  "definitions": {
-    "NOTIFICATION_LINKSERIALIZER": {
-      "title": "Vnfpackage",
-      "description": "Link to the resource representing the VNF package to which the notified change applies.",
-      "required": [
-        "href"
-      ],
-      "type": "object",
-      "properties": {
-        "href": {
-          "title": "Href",
-          "description": "URI of the referenced resource.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "PkgmLinks": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "type": "object",
-      "properties": {
-        "vnfPackage": {
-          "$ref": "#/definitions/NOTIFICATION_LINKSERIALIZER"
-        },
-        "subscription": {
-          "$ref": "#/definitions/NOTIFICATION_LINKSERIALIZER"
-        }
-      }
-    },
-    "PkgChangeNotification": {
-      "required": [
-        "id",
-        "notificationType",
-        "timeStamp",
-        "subscriptionId",
-        "vnfPkgId",
-        "changeType",
-        "vnfdId",
-        "_links"
-      ],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of this notification.",
-          "type": "string",
-          "minLength": 1
-        },
-        "notificationType": {
-          "title": "Notificationtype",
-          "description": "Discriminator for the different notification types.",
-          "type": "string",
-          "enum": [
-            "VnfPackageChangeNotification"
-          ]
-        },
-        "timeStamp": {
-          "title": "Timestamp",
-          "description": "Date-time of the generation of the notification.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "subscriptionId": {
-          "title": "Subscriptionid",
-          "description": "Identifier of the subscription that this notification relates to.",
-          "type": "string",
-          "minLength": 1
-        },
-        "vnfPkgId": {
-          "title": "Vnfpkgid",
-          "description": "Identifier of the VNF package.",
-          "type": "string",
-          "minLength": 1
-        },
-        "changeType": {
-          "title": "Changetype",
-          "description": "The type of change of the VNF package.",
-          "type": "string",
-          "enum": [
-            "OP_STATE_CHANGE",
-            "PKG_DELETE"
-          ]
-        },
-        "operationalState": {
-          "title": "Operationalstate",
-          "description": "New operational state of the VNF package.",
-          "type": "string",
-          "enum": [
-            "ENABLED",
-            "DISABLED"
-          ]
-        },
-        "vnfdId": {
-          "title": "Vnfdid",
-          "description": "This identifier, which is managed by the VNF provider, identifies the VNF package and the VNFD in a globally unique way.",
-          "type": "string",
-          "minLength": 1
-        },
-        "_links": {
-          "$ref": "#/definitions/PkgmLinks"
-        }
-      }
-    },
-    "PkgOnboardingNotification": {
-      "required": [
-        "id",
-        "notificationType",
-        "subscriptionId",
-        "timeStamp",
-        "vnfPkgId",
-        "vnfdId",
-        "_links"
-      ],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of this notification.",
-          "type": "string",
-          "minLength": 1
-        },
-        "notificationType": {
-          "title": "Notificationtype",
-          "description": "Discriminator for the different notification types.",
-          "type": "string",
-          "enum": [
-            "VnfPackageOnboardingNotification"
-          ]
-        },
-        "subscriptionId": {
-          "title": "Subscriptionid",
-          "description": "Identifier of the subscription that this notification relates to.",
-          "type": "string",
-          "minLength": 1
-        },
-        "timeStamp": {
-          "title": "Timestamp",
-          "description": "Date-time of the generation of the notification.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "vnfPkgId": {
-          "title": "Vnfpkgid",
-          "description": "Identifier of the VNF package.",
-          "type": "string",
-          "minLength": 1
-        },
-        "vnfdId": {
-          "title": "Vnfdid",
-          "description": "This identifier, which is managed by the VNF provider, identifies the VNF package and the VNFD in a globally unique way.",
-          "type": "string",
-          "minLength": 1
-        },
-        "_links": {
-          "$ref": "#/definitions/PkgmLinks"
-        }
-      }
-    }
-  }
-}
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/SOL003-VNFPackageManagement-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/SOL003-VNFPackageManagement-API.json
deleted file mode 100644
index 17d81f44c1..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-api/src/main/resources/SOL003-VNFPackageManagement-API.json
+++ /dev/null
@@ -1,7352 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1",
-    "title": "SOL003 - VNF Package Management interface",
-    "description": "SOL003 - VNF Package Management interface\n\nIMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.\n\nIn clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based filtering mechanism is defined. This mechanism is currently not included in the corresponding OpenAPI design for this GS version. Changes to the attribute-based filtering mechanism are being considered in v2.5.1 of this GS for inclusion in the corresponding future ETSI NFV OpenAPI design.\nPlease report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=\n",
-    "license": {
-      "name": "ETSI Forge copyright notice",
-      "url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
-    }
-  },
-  "externalDocs": {
-    "description": "ETSI GS NFV-SOL 003 V2.5.1",
-    "url": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf"
-  },
-  "basePath": "/vnfpkgm/v1",
-  "schemes": [
-    "https"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {
-    "/api-versions": {
-      "parameters": [
-        {
-          "name": "Version",
-          "description": "Version of the API requested to use when responding to this request.\n",
-          "in": "header",
-          "required": false,
-          "type": "string"
-        }
-      ],
-      "get": {
-        "summary": "Retrieve API version information",
-        "description": "The GET method reads API version information. This method shall follow the provisions specified in table 4.6.3.3.3.2-1 for request and response data structures, and response codes. URI query parameters are not supported.\n",
-        "responses": {
-          "200": {
-            "description": "200 OK\nAPI version information was read successfully. The response body shall contain 4.4 API version information, as defined in clause 4.4.1.13.\n",
-            "schema": {
-              "description": "This type represents API version information. It shall comply with the provisions defined in table 4.4.1.13-1 (SOL003).\n",
-              "type": "object",
-              "required": [
-                "uriPrefix",
-                "apiVersions"
-              ],
-              "properties": {
-                "uriPrefix": {
-                  "description": "Specifies the URI prefix for the API, in the following form {apiRoot}/{apiName}/{apiMajorVersion}/\n",
-                  "type": "string"
-                },
-                "apiVersions": {
-                  "description": "Version(s) supported for the API signaled by the uriPrefix attribute.\n",
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "required": [
-                      "version"
-                    ],
-                    "properties": {
-                      "version": {
-                        "description": "Identifies a supported version. The value of the version attribute shall be a version identifier as specified in clause 4.6.1.\n",
-                        "type": "string"
-                      },
-                      "isDeprecated": {
-                        "description": "If such information is available, this attribute indicates whether use of the version signaled by the version attribute is deprecated (true) or not (false). A deprecated version is still supported by the API producer but is recommended not to be used any longer. When a version is no longer supported, it does not appear in the response body.\n",
-                        "type": "boolean"
-                      },
-                      "retirementDate": {
-                        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-                        "type": "string",
-                        "format": "date-time"
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Version": {
-                "description": "The used API version.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "405 METHOD NOT ALLOWED\nIf a particular HTTP method is not supported for a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "413": {
-            "description": "413 PAYLOAD TOO LARGE\nIf the payload body of a request is larger than the amount of data the API producer is willing or able to process, it shall respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for closing the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "414": {
-            "description": "414 URI TOO LONG\nIf the request URI of a request is longer than the API producer is willing or able to process, it shall respond with this response code. This condition can e.g. be caused by passing long queries in the request URI of a GET request. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "422 UNPROCESSABLE ENTITY\nIf the payload body of a request contains syntactically correct data (e.g. well-formed JSON) but the data cannot be processed (e.g. because it fails validation against a schema), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nThis error response code is only applicable for methods that have a request body.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "429": {
-            "description": "429 TOO MANY REQUESTS\nIf the API consumer has sent too many requests in a defined period of time and the API producer is able to detect that condition (\"rate limiting\"), the API producer shall respond with this response code, following the provisions in IETF RFC 6585 [17] for the use of the \"Retry-After\" HTTP header. The \"ProblemDetails\" structure shall be provided and shall include in the \"detail\" attribute more information about the source of the problem.\nThe period of time and allowed number of requests are configured within the API producer by means outside the scope of the present document.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "504": {
-            "description": "504 GATEWAY TIMEOUT\nIf the API producer encounters a timeout while waiting for a response from an upstream server (i.e. a server that the API producer communicates with when fulfilling a request), it should respond with this response code.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/vnf_packages": {
-      "get": {
-        "description": "Query VNF Package Info\n\nThe GET method queries the information of the VNF packages matching the filter.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "filter",
-            "description": "Attribute-based filtering expression according to clause 4.3.2. The VNFM shall support receiving this parameter as part of the  URI query string. The NFVO may supply this parameter.  All attribute names that appear in the VnfPkgInfo and in data  types referenced from it shall be supported by the VNFM in the  filter expression.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "all_fields",
-            "description": "Include all complex attributes in the response. See clause 4.3.3 for details. The VNFM shall support this parameter.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "fields",
-            "description": "Complex attributes to be included into the response. See clause 4.3.3 for details. The VNFM should support this parameter.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "exclude_fields",
-            "description": "Complex attributes to be excluded from the response. See clause 4.3.3 for details. The VNFM should support this parameter.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "exclude_default",
-            "description": "Indicates to exclude the following complex attributes from the response. See clause 4.3.3 for details. The VNFM shall support this parameter. The following attributes shall be excluded from the VnfPkgInfo structure in the response body if this parameter is provided, or none of the parameters \"all_fields,\" \"fields\", \"exclude_fields\", \"exclude_default\" are provided: -\tsoftwareImages -\tadditionalArtifacts -\tuserDefinedData.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "nextpage_opaque_marker",
-            "description": "Marker to obtain the next page of a paged response. Shall be supported by the  VNFM if the VNFM supports alternative 2 (paging) according to clause 4.7.2.1  for this resource.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nInformation about zero or more VNF packages was queried successfully. The response body shall contain in an array the VNF package info  representations that match the attribute filter, i.e. zero or more VNF package representations as defined in clause 10.5.2.2. If the VNFM supports alternative 2 (paging) according to clause  4.7.2.1 for this resource, inclusion of the Link HTTP header in  this response shall follow the provisions in clause 4.7.2.3.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Link": {
-                "description": "Reference to other resources. Used for paging in the present document, see clause 4.7.2.1.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "type": "array",
-              "items": {
-                "description": "This type represents the information of an VNF package.\n",
-                "type": "object",
-                "required": [
-                  "id",
-                  "operationalState",
-                  "usageState",
-                  "_links"
-                ],
-                "properties": {
-                  "id": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "vnfdId": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "vnfProvider": {
-                    "description": "Provider of the VNF package and the VNFD. This information is copied from the VNFD.\n",
-                    "type": "string"
-                  },
-                  "vnfProductName": {
-                    "description": "Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise.\n",
-                    "type": "string"
-                  },
-                  "vnfSoftwareVersion": {
-                    "description": "A Version.\n",
-                    "type": "string"
-                  },
-                  "vnfdVersion": {
-                    "description": "A Version.\n",
-                    "type": "string"
-                  },
-                  "checksum": {
-                    "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                    "type": "object",
-                    "required": [
-                      "algorithm",
-                      "hash"
-                    ],
-                    "properties": {
-                      "algorithm": {
-                        "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                        "type": "string"
-                      },
-                      "hash": {
-                        "description": "The hexadecimal value of the checksum.\n",
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "softwareImages": {
-                    "description": "Information about VNF package artifacts that are software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector.\n",
-                    "type": "array",
-                    "items": {
-                      "description": "This type represents an artifact contained in a VNF package which represents a software image.\n",
-                      "type": "object",
-                      "required": [
-                        "id",
-                        "name",
-                        "provider",
-                        "version",
-                        "checksum",
-                        "containerFormat",
-                        "diskFormat",
-                        "createdAt",
-                        "minDisk",
-                        "minRam",
-                        "size",
-                        "imagePath"
-                      ],
-                      "properties": {
-                        "id": {
-                          "description": "An identifier that is unique within a VNF descriptor.\n",
-                          "type": "string"
-                        },
-                        "name": {
-                          "description": "Name of the software image.\n",
-                          "type": "string"
-                        },
-                        "provider": {
-                          "description": "Provider of the software image.\n",
-                          "type": "string"
-                        },
-                        "version": {
-                          "description": "A Version.\n",
-                          "type": "string"
-                        },
-                        "checksum": {
-                          "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                          "type": "object",
-                          "required": [
-                            "algorithm",
-                            "hash"
-                          ],
-                          "properties": {
-                            "algorithm": {
-                              "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                              "type": "string"
-                            },
-                            "hash": {
-                              "description": "The hexadecimal value of the checksum.\n",
-                              "type": "string"
-                            }
-                          }
-                        },
-                        "containerFormat": {
-                          "description": "Container format indicates whether the software image is in a file format that also contains metadata about the actual software. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - BARE: the image does not have a container or metadata envelope - DOCKER: docker container format - OVA: OVF package in a tarfile - OVF: OVF container format The list of permitted values was taken from \"Container formats\" in  http://docs.openstack.org/image-guide/image-formats.html\n",
-                          "type": "string",
-                          "enum": [
-                            "AKI",
-                            "AMI",
-                            "ARI",
-                            "BARE",
-                            "DOCKER",
-                            "OVA",
-                            "OVF"
-                          ]
-                        },
-                        "diskFormat": {
-                          "description": "Disk format of a software image is the format of the underlying disk image. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - ISO: an archive format for the data contents of an optical disc,  such as CD-ROM\n- QCOW2: a common disk image format, which can expand dynamically  and supports copy on write\n- RAW: an unstructured disk image format - VDI: a common disk image format - VHD: a common disk image format - VHDX: enhanced version of VHD format - VMDK: a common disk image format The list of permitted values was adapted from \"Disk formats\" in  http://docs.openstack.org/image-guide/image-formats.html\n",
-                          "type": "string",
-                          "enum": [
-                            "AKI",
-                            "AMI",
-                            "ISO",
-                            "QCOW2",
-                            "RAW",
-                            "VDI",
-                            "VHD",
-                            "VHDX",
-                            "VMDK"
-                          ]
-                        },
-                        "createdAt": {
-                          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-                          "type": "string",
-                          "format": "date-time"
-                        },
-                        "minDisk": {
-                          "description": "The minimal disk for this software image in bytes.\n",
-                          "type": "integer"
-                        },
-                        "minRam": {
-                          "description": "The minimal RAM for this software image in bytes.\n",
-                          "type": "integer"
-                        },
-                        "size": {
-                          "description": "Size of this software image in bytes.\n",
-                          "type": "integer"
-                        },
-                        "userMetadata": {
-                          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                          "type": "object"
-                        },
-                        "imagePath": {
-                          "description": "Path in the VNF package, which identifies the image artifact and also allows to access a copy of the image artifact.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  },
-                  "additionalArtifacts": {
-                    "description": "Information about VNF package artifacts contained in the VNF package that are not software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present if the VNF package contains additional artifacts.\n",
-                    "type": "array",
-                    "items": {
-                      "description": "This type represents an artifact other than a software image which is contained in a VNF package.\n",
-                      "type": "object",
-                      "required": [
-                        "artifactPath",
-                        "checksum"
-                      ],
-                      "properties": {
-                        "artifactPath": {
-                          "description": "Path in the VNF package, which identifies the artifact and also allows to access a copy of the artifact.\n",
-                          "type": "string"
-                        },
-                        "checksum": {
-                          "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                          "type": "object",
-                          "required": [
-                            "algorithm",
-                            "hash"
-                          ],
-                          "properties": {
-                            "algorithm": {
-                              "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                              "type": "string"
-                            },
-                            "hash": {
-                              "description": "The hexadecimal value of the checksum.\n",
-                              "type": "string"
-                            }
-                          }
-                        },
-                        "metadata": {
-                          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                          "type": "object"
-                        }
-                      }
-                    }
-                  },
-                  "onboardingState": {
-                    "description": "CREATED: The VNF package resource has been created. UPLOADING: The associated VNF package content is being uploaded. PROCESSING: The associated VNF package content is being processed, e.g.,  validation.\nONBOARDED: The associated VNF package content has been successfully  on-boarded.\n",
-                    "type": "string",
-                    "enum": [
-                      "CREATED",
-                      "UPLOADING",
-                      "PROCESSING",
-                      "ONBOARDED"
-                    ]
-                  },
-                  "operationalState": {
-                    "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                    "type": "string",
-                    "enum": [
-                      "ENABLED",
-                      "DISABLED"
-                    ]
-                  },
-                  "usageState": 
-                  {
-                    "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n",
-                    "type": "string",
-                    "enum": [
-                      "IN_USE",
-                      "NOT_IN_USE"
-                    ]
-                  },
-                  "userDefinedData": {
-                    "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                    "type": "object"
-                  },
-                  "_links": {
-                    "description": "Links to resources related to this resource.\n",
-                    "type": "object",
-                    "required": [
-                      "self",
-                      "packageContent"
-                    ],
-                    "properties": {
-                      "self": {
-                        "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                        "type": "object",
-                        "required": [
-                          "href"
-                        ],
-                        "properties": {
-                          "href": {
-                            "description": "String formatted according to IETF RFC 3986.\n",
-                            "type": "string"
-                          }
-                        }
-                      },
-                      "vnfd": {
-                        "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                        "type": "object",
-                        "required": [
-                          "href"
-                        ],
-                        "properties": {
-                          "href": {
-                            "description": "String formatted according to IETF RFC 3986.\n",
-                            "type": "string"
-                          }
-                        }
-                      },
-                      "packageContent": {
-                        "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                        "type": "object",
-                        "required": [
-                          "href"
-                        ],
-                        "properties": {
-                          "href": {
-                            "description": "String formatted according to IETF RFC 3986.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/vnf_packages/{vnfPkgId}": {
-      "parameters": [
-        {
-          "name": "vnfPkgId",
-          "description": "Identifier of the VNF package. The identifier is allocated by the NFVO. This identifier can be retrieved from the \"vnfPkgId\" attribute in the VnfPackageOnboardingNotification or VnfPackageChangeNotification.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Query VNF Package Info\n\nThe GET method reads the information of an individual VNF package.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nInformation of the selected VNF packages.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "This type represents the information of an VNF package.\n",
-              "type": "object",
-              "required": [
-                "id",
-                "operationalState",
-                "usageState",
-                "_links"
-              ],
-              "properties": {
-                "id": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfdId": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "vnfProvider": {
-                  "description": "Provider of the VNF package and the VNFD. This information is copied from the VNFD.\n",
-                  "type": "string"
-                },
-                "vnfProductName": {
-                  "description": "Name to identify the VNF product. Invariant for the VNF product lifetime. This information is copied from the VNFD. It shall be present after the VNF package content has been on-boarded and absent otherwise.\n",
-                  "type": "string"
-                },
-                "vnfSoftwareVersion": {
-                  "description": "A Version.\n",
-                  "type": "string"
-                },
-                "vnfdVersion": {
-                  "description": "A Version.\n",
-                  "type": "string"
-                },
-                "checksum": {
-                  "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                  "type": "object",
-                  "required": [
-                    "algorithm",
-                    "hash"
-                  ],
-                  "properties": {
-                    "algorithm": {
-                      "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                      "type": "string"
-                    },
-                    "hash": {
-                      "description": "The hexadecimal value of the checksum.\n",
-                      "type": "string"
-                    }
-                  }
-                },
-                "softwareImages": {
-                  "description": "Information about VNF package artifacts that are software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present unless it has been requested to be excluded per attribute selector.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents an artifact contained in a VNF package which represents a software image.\n",
-                    "type": "object",
-                    "required": [
-                      "id",
-                      "name",
-                      "provider",
-                      "version",
-                      "checksum",
-                      "containerFormat",
-                      "diskFormat",
-                      "createdAt",
-                      "minDisk",
-                      "minRam",
-                      "size",
-                      "imagePath"
-                    ],
-                    "properties": {
-                      "id": {
-                        "description": "An identifier that is unique within a VNF descriptor.\n",
-                        "type": "string"
-                      },
-                      "name": {
-                        "description": "Name of the software image.\n",
-                        "type": "string"
-                      },
-                      "provider": {
-                        "description": "Provider of the software image.\n",
-                        "type": "string"
-                      },
-                      "version": {
-                        "description": "A Version.\n",
-                        "type": "string"
-                      },
-                      "checksum": {
-                        "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                        "type": "object",
-                        "required": [
-                          "algorithm",
-                          "hash"
-                        ],
-                        "properties": {
-                          "algorithm": {
-                            "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                            "type": "string"
-                          },
-                          "hash": {
-                            "description": "The hexadecimal value of the checksum.\n",
-                            "type": "string"
-                          }
-                        }
-                      },
-                      "containerFormat": {
-                        "description": "Container format indicates whether the software image is in a file format that also contains metadata about the actual software. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - BARE: the image does not have a container or metadata envelope - DOCKER: docker container format - OVA: OVF package in a tarfile - OVF: OVF container format The list of permitted values was taken from \"Container formats\" in  http://docs.openstack.org/image-guide/image-formats.html\n",
-                        "type": "string",
-                        "enum": [
-                          "AKI",
-                          "AMI",
-                          "ARI",
-                          "BARE",
-                          "DOCKER",
-                          "OVA",
-                          "OVF"
-                        ]
-                      },
-                      "diskFormat": {
-                        "description": "Disk format of a software image is the format of the underlying disk image. Permitted values: - AKI: a kernel image format - AMI: a machine image format - ARI: a ramdisk image format - ISO: an archive format for the data contents of an optical disc,  such as CD-ROM\n- QCOW2: a common disk image format, which can expand dynamically  and supports copy on write\n- RAW: an unstructured disk image format - VDI: a common disk image format - VHD: a common disk image format - VHDX: enhanced version of VHD format - VMDK: a common disk image format The list of permitted values was adapted from \"Disk formats\" in  http://docs.openstack.org/image-guide/image-formats.html\n",
-                        "type": "string",
-                        "enum": [
-                          "AKI",
-                          "AMI",
-                          "ISO",
-                          "QCOW2",
-                          "RAW",
-                          "VDI",
-                          "VHD",
-                          "VHDX",
-                          "VMDK"
-                        ]
-                      },
-                      "createdAt": {
-                        "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "minDisk": {
-                        "description": "The minimal disk for this software image in bytes.\n",
-                        "type": "integer"
-                      },
-                      "minRam": {
-                        "description": "The minimal RAM for this software image in bytes.\n",
-                        "type": "integer"
-                      },
-                      "size": {
-                        "description": "Size of this software image in bytes.\n",
-                        "type": "integer"
-                      },
-                      "userMetadata": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      },
-                      "imagePath": {
-                        "description": "Path in the VNF package, which identifies the image artifact and also allows to access a copy of the image artifact.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                },
-                "additionalArtifacts": {
-                  "description": "Information about VNF package artifacts contained in the VNF package that are not software images. This attribute shall not be present before the VNF package content is on-boarded. Otherwise, this attribute shall be present if the VNF package contains additional artifacts.\n",
-                  "type": "array",
-                  "items": {
-                    "description": "This type represents an artifact other than a software image which is contained in a VNF package.\n",
-                    "type": "object",
-                    "required": [
-                      "artifactPath",
-                      "checksum"
-                    ],
-                    "properties": {
-                      "artifactPath": {
-                        "description": "Path in the VNF package, which identifies the artifact and also allows to access a copy of the artifact.\n",
-                        "type": "string"
-                      },
-                      "checksum": {
-                        "description": "This type represents the checksum of a VNF package or an artifact file.\n",
-                        "type": "object",
-                        "required": [
-                          "algorithm",
-                          "hash"
-                        ],
-                        "properties": {
-                          "algorithm": {
-                            "description": "Name of the algorithm used to generate the checksum, as defined in ETSI GS NFV-SOL 004. For example, SHA-256, SHA-512.\n",
-                            "type": "string"
-                          },
-                          "hash": {
-                            "description": "The hexadecimal value of the checksum.\n",
-                            "type": "string"
-                          }
-                        }
-                      },
-                      "metadata": {
-                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                        "type": "object"
-                      }
-                    }
-                  }
-                },
-                "onboardingState": {
-                  "description": "CREATED: The VNF package resource has been created. UPLOADING: The associated VNF package content is being uploaded. PROCESSING: The associated VNF package content is being processed, e.g.,  validation.\nONBOARDED: The associated VNF package content has been successfully  on-boarded.\n",
-                  "type": "string",
-                  "enum": [
-                    "CREATED",
-                    "UPLOADING",
-                    "PROCESSING",
-                    "ONBOARDED"
-                  ]
-                },
-                "operationalState": {
-                  "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                  "type": "string",
-                  "enum": [
-                    "ENABLED",
-                    "DISABLED"
-                  ]
-                },
-                "usageState": 
-                {
-                  "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n",
-                  "type": "string",
-                  "enum": [
-                    "IN_USE",
-                    "NOT_IN_USE"
-                  ]
-                },
-                "userDefinedData": {
-                  "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of key- value pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 7159.\n",
-                  "type": "object"
-                },
-                "_links": {
-                  "description": "Links to resources related to this resource.\n",
-                  "type": "object",
-                  "required": [
-                    "self",
-                    "packageContent"
-                  ],
-                  "properties": {
-                    "self": {
-                      "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "String formatted according to IETF RFC 3986.\n",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    "vnfd": {
-                      "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "String formatted according to IETF RFC 3986.\n",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    "packageContent": {
-                      "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "String formatted according to IETF RFC 3986.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/vnf_packages/{vnfPkgId}/vnfd": {
-      "parameters": [
-        {
-          "name": "vnfPkgId",
-          "description": "Identifier of the on-boarded VNF package. The identifier is allocated by the NFVO. This identifier can be retrieved from the \"vnfPkgId\" attribute in the VnfPackageOnboardingNotification or VnfPackageChangeNotification.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Query VNF Package Info\n\nThe GET method reads the content of the VNFD within a VNF package. The VNFD can be implemented as a single file or as a collection of multiple files. If the VNFD is implemented in the form of multiple files, a ZIP file embedding these files shall be returned. If the VNFD is implemented as a single file, either that file or a ZIP file embedding that file shall be returned. The selection of the format is controlled by the \"Accept\" HTTP header passed in the GET request. * If the \"Accept\" header contains only \"text/plain\" and the VNFD is  implemented as a single file, the file shall be returned;\n  otherwise, an error message shall be returned.\n* If the \"Accept\" header contains only \"application/zip\", the single  file or the multiple files that make up the VNFD shall be returned\n  embedded in a ZIP file.\n* If the \"Accept\" header contains both \"text/plain\" and  \"application/zip\", it is up to the NFVO to choose the format to\n  return for a single-file VNFD; for a multi-file VNFD, a ZIP file\n  shall be returned.\nThe default format of the ZIP file shall be the one specified in ETSI GS NFV-SOL 004 where only the YAML files representing the VNFD, and information needed to navigate the ZIP file and to identify the file that is the entry point for parsing the VNFD (such as TOSCA-meta or manifest files or naming conventions) are included.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Permitted values: \"text/plain\" and/or \"application/zip\" Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string",
-            "enum": [
-              "text/plain",
-              "application/zip",
-              "text/plain+application/zip"
-            ]
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nOn success, the content of the VNFD is returned. The payload body shall contain a copy of the file representing the VNFD or a ZIP file that contains the file or multiple files representing the VNFD, as specified above. The \"Content-Type\" HTTP header shall be set according to the format of the returned file, i.e. to \"text/plain\" for a YAML file or to \"application/zip\" for a ZIP file.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "enum": [
-                  "text/plain",
-                  "application/zip"
-                ],
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "Not Acceptable\nIf the \"Accept\" header does not contain at least one name of a content type for which the NFVO can provide a representation of the VNFD, the NFVO shall respond with this response code. The \"ProblemDetails\" structure may be included with the \"detail\" attribute providing more information about the error.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "409": {
-            "description": "Conflict\nError: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that \"onboardingState\" of the VNF package has a value different from \"ONBOARDED\". The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute shall convey more information about the error.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/vnf_packages/{vnfPkgId}/package_content": {
-      "parameters": [
-        {
-          "name": "vnfPkgId",
-          "description": "Identifier of the VNF package. The identifier is allocated by the NFVO. This identifier can be retrieved from the \"vnfPkgId\" attribute in the VnfPackageOnboardingNotification or VnfPackageChangeNotification.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Fetch VNF Package\n\nThe GET method fetches the content of a VNF package identified by the VNF package identifier allocated by the NFVO.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response.\n",
-            "in": "header",
-            "required": true,
-            "type": "string",
-            "enum": [
-              "text/plain",
-              "application/zip"
-            ]
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Range",
-            "description": "The request may contain a \"Range\" HTTP header to obtain single range of bytes from the VNF package file. This can be used to continue an aborted transmission. If the NFVO does not support range requests, it should return the whole file with a 200 OK response instead.\n",
-            "in": "header",
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nOn success, a copy of the VNF package file is returned. The response body shall include a copy of the VNF package file. The \"Content-Type HTTP\" header shall be set according to the type of the file, i.e. to \"application/zip\" for a VNF Package as defined in ETSI GS NFV-SOL 004.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "206": {
-            "description": "206 PARTIAL CONTENT\nOn success, if the NFVO supports range requests, a single consecutive byte range from the content of the VNF package file is returned. The response body shall contain the requested part of the VNF package file. The \"Content-Range\" HTTP header shall be provided according to IETF RFC 7233. The \"Content-Type\" HTTP header shall be set as defined above for the \"200 OK\" response.\n",
-            "headers": {
-              "Content-Range": {
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "409": {
-            "description": "Conflict\nError: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that \"onboardingState\" of the VNF package has a value different from \"ONBOARDED\". The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute shall convey more information about the error.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "Requested Range Not Satisfiable\nThe byte range passed in the \"Range\" header did not match any available byte range in the VNF package file (e.g. \"access after end of file\"). The response body may contain a ProblemDetails structure.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/vnf_packages/{vnfPkgId}/artifacts/{artifactPath}": {
-      "parameters": [
-        {
-          "name": "artifactPath",
-          "description": "Sequence of one or more path segments representing the path of  the artifact within the VNF package. EXAMPLE: foo/bar/run.sh This identifier can be retrieved from the \"artifactPath\" attribute of the applicable \"additionalArtifacts\" entry in the body of the response to a GET request querying the \"Individual VNF package\" or the \"VNF packages\" resource.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        },
-        {
-          "name": "vnfPkgId",
-          "description": "Identifier of the VNF package. The identifier is allocated by the NFVO. This identifier can be retrieved from the \"vnfPkgId\" attribute in the VnfPackageOnboardingNotification or VnfPackageChangeNotification.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Fetch VNF Package Artifacts\n\nThe GET method fetches the content of an artifact within a VNF package.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Range",
-            "description": "The request may contain a \"Range\" HTTP header to obtain single range of bytes from the VNF package file. This can be used to continue an aborted transmission. If the NFVO does not support range requests, it should return the whole file with a 200 OK response instead.\n",
-            "in": "header",
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nOn success, the content of the artifact is returned. The payload body shall contain a copy of the artifact file from the VNF package, as defined by ETSI GS NFV-SOL 004. The \"Content-Type\" HTTP header shall be set according to the content type of the artifact file. If the content type cannot be determined, the header shall be set to the value \"application/octet-stream\".\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response. The \"Content-Type\" HTTP header shall be set according to the content type of the artifact file. If the content type cannot be determined, the header shall be set to the value \"application/octet-stream\".\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "206": {
-            "description": "206 PARTIAL CONTENT\nOn success, if the NFVO supports range requests, a single consecutive byte range from the content of the VNF package file is returned. The response body shall contain the requested part of the VNF package file. The \"Content-Range\" HTTP header shall be provided according to IETF RFC 7233. The \"Content-Type\" HTTP header shall be set as defined above for the \"200 OK\" response.\n",
-            "headers": {
-              "Content-Range": {
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "409": {
-            "description": "Conflict\nError: The operation cannot be executed currently, due to a conflict with the state of the resource. Typically, this is due to the fact that \"onboardingState\" of the VNF package has a value different from \"ONBOARDED\". The response body shall contain a ProblemDetails structure, in which the \"detail\" attribute shall convey more information about the error.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "Requested Range Not Satisfiable\nThe byte range passed in the \"Range\" header did not match any available byte range in the VNF package file (e.g. \"access after end of file\"). The response body may contain a ProblemDetails structure.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions": {
-      "post": {
-        "description": "Subscribe\n\nThe POST method creates a new subscription. Creation of two subscription resources with the same callbackURI and the same filter can result in performance degradation and will provide duplicates of notifications to the VNFM, and might make sense only in very rare use cases. Consequently, the NFVO may either allow creating a subscription resource if another subscription resource with the same filter and callbackUri already exists (in which case it shall return the “201 Created” response code), or may decide to not create a duplicate subscription resource (in which case it shall return a “303 See Other” response code referencing the existing subscription resource with the same filter and callbackUri).\n",
-        "parameters": [
-          {
-            "name": "PkgmSubscriptionRequest",
-            "description": "Representation of the created subscription resource. The HTTP response shall include a \"Location\" HTTP header that points to the created subscription resource.\n",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "description": "This type represents a subscription request related to VNF package management notifications about VNF package on-boarding or changes.\n",
-              "type": "object",
-              "required": [
-                "callbackUri"
-              ],
-              "properties": {
-                "filter": {
-                  "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-                  "type": "object",
-                  "properties": {
-                    "notificationTypes": {
-                      "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "enum": [
-                          "VnfPackageOnboardingNotification",
-                          "VnfPackageChangeNotification"
-                        ]
-                      }
-                    },
-                    "vnfProductsFromProviders": {
-                      "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "type": "object",
-                        "required": [
-                          "vnfProvider"
-                        ],
-                        "properties": {
-                          "vnfProvider": {
-                            "description": "Name of the VNF provider to match.\n",
-                            "type": "string"
-                          },
-                          "vnfProducts": {
-                            "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n",
-                            "type": "array",
-                            "items": {
-                              "type": "object",
-                              "required": [
-                                "vnfProductName"
-                              ],
-                              "properties": {
-                                "vnfProductName": {
-                                  "description": "Name of the VNF product to match.\n",
-                                  "type": "string"
-                                },
-                                "versions": {
-                                  "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n",
-                                  "type": "array",
-                                  "items": {
-                                    "type": "object",
-                                    "required": [
-                                      "vnfSoftwareVersion"
-                                    ],
-                                    "properties": {
-                                      "vnfSoftwareVersion": {
-                                        "description": "A Version.\n",
-                                        "type": "string"
-                                      },
-                                      "vnfdVersions": {
-                                        "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-                                        "type": "array",
-                                        "items": {
-                                          "description": "A Version.\n",
-                                          "type": "string"
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "vnfdId": {
-                      "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    },
-                    "vnfPkgId": {
-                      "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    },
-                    "operationalState": 
-                    {
-                      "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                      "type": "array",
-                      "items": 
-                      {
-                        "type": "string",
-                        "enum": [
-                          "ENABLED",
-                          "DISABLED"
-                        ]
-                      }
-                    },
-                    "usageState": 
-                    {
-                      "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n",
-                      "type": "array",
-                      "items": 
-                      {
-                        "type": "string",
-                        "enum": [
-                          "IN_USE",
-                          "NOT_IN_USE"
-                        ]
-                      }
-                    }
-                  }
-                },
-                "callbackUri": {
-                  "description": "String formatted according to IETF RFC 3986.\n",
-                  "type": "string"
-                },
-                "authentication": {
-                  "type": "object",
-                  "required": [
-                    "authType"
-                  ],
-                  "properties": {
-                    "authType": {
-                      "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification. Permitted values: * BASIC: In every HTTP request to the notification endpoint, use  HTTP Basic authentication with the client credentials. \n* OAUTH2_CLIENT_CREDENTIALS: In every HTTP request to the  notification endpoint, use an OAuth 2.0 Bearer token, obtained\n  using the client credentials grant type.\n* TLS_CERT: Every HTTP request to the notification endpoint is sent  over a mutually authenticated TLS session, i.e. not only the\n  server is authenticated, but also the client is authenticated\n  during the TLS tunnel setup.\n",
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "enum": [
-                          "BASIC",
-                          "OAUTH2_CLIENT_CREDENTIALS",
-                          "TLS_CERT"
-                        ]
-                      }
-                    },
-                    "paramsBasic": {
-                      "description": "Parameters for authentication/authorization using BASIC. Shall be present if authType is \"BASIC\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-                      "type": "object",
-                      "properties": {
-                        "userName": {
-                          "description": "Username to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                          "type": "string"
-                        },
-                        "password": {
-                          "description": "Password to be used in HTTP Basic authentication. Shall be present if it has not been provisioned out of band.\n",
-                          "type": "string"
-                        }
-                      }
-                    },
-                    "paramsOauth2ClientCredentials": {
-                      "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS. Shall be present if authType is \"OAUTH2_CLIENT_CREDENTIALS\" and the contained information has not been provisioned out of band. Shall be absent otherwise.\n",
-                      "type": "object",
-                      "properties": {
-                        "clientId": {
-                          "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                          "type": "string"
-                        },
-                        "clientPassword": {
-                          "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.  Shall be present if it has not been provisioned out of band. The clientId and clientPassword passed in a subscription shall not be the same as the clientId and clientPassword that are used to obtain authorization for API requests. Client credentials may differ between subscriptions. The value of clientPassword should be generated by a random process.\n",
-                          "type": "string"
-                        },
-                        "tokenEndpoint": {
-                          "description": "String formatted according to IETF RFC 3986.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Content-Type",
-            "description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "201": {
-            "description": "201 CREATED\nRepresentation of the created subscription resource. The HTTP response shall include a \"Location\" HTTP header that points to the created subscription resource.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Location": {
-                "description": "The resource URI of the created VNF instance",
-                "type": "string",
-                "format": "url"
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "type": "array",
-              "items": {
-                "description": "This type represents a subscription related to notifications about VNF package management.\n",
-                "type": "object",
-                "required": [
-                  "id",
-                  "callbackUri",
-                  "_links"
-                ],
-                "properties": {
-                  "id": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "filter": {
-                    "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-                    "type": "object",
-                    "properties": {
-                      "notificationTypes": {
-                        "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-                        "type": "array",
-                        "items": {
-                          "type": "string",
-                          "enum": [
-                            "VnfPackageOnboardingNotification",
-                            "VnfPackageChangeNotification"
-                          ]
-                        }
-                      },
-                      "vnfProductsFromProviders": {
-                        "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "required": [
-                            "vnfProvider"
-                          ],
-                          "properties": {
-                            "vnfProvider": {
-                              "description": "Name of the VNF provider to match.\n",
-                              "type": "string"
-                            },
-                            "vnfProducts": {
-                              "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n",
-                              "type": "array",
-                              "items": {
-                                "type": "object",
-                                "required": [
-                                  "vnfProductName"
-                                ],
-                                "properties": {
-                                  "vnfProductName": {
-                                    "description": "Name of the VNF product to match.\n",
-                                    "type": "string"
-                                  },
-                                  "versions": {
-                                    "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n",
-                                    "type": "array",
-                                    "items": {
-                                      "type": "object",
-                                      "required": [
-                                        "vnfSoftwareVersion"
-                                      ],
-                                      "properties": {
-                                        "vnfSoftwareVersion": {
-                                          "description": "A Version.\n",
-                                          "type": "string"
-                                        },
-                                        "vnfdVersions": {
-                                          "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-                                          "type": "array",
-                                          "items": {
-                                            "description": "A Version.\n",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "vnfdId": {
-                        "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier with the intention of being globally unique.\n",
-                          "type": "string"
-                        }
-                      },
-                      "vnfPkgId": {
-                        "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier with the intention of being globally unique.\n",
-                          "type": "string"
-                        }
-                      },
-                      "operationalState": 
-                      {
-                        "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                        "type": "array",
-                        "items": 
-                        {
-                          "type": "string",
-                          "enum": [
-                            "ENABLED",
-                            "DISABLED"
-                          ]
-                        }
-                      },
-                      "usageState": 
-                      {
-                        "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n",
-                        "type": "array",
-                        "items": 
-                        {
-                          "type": "string",
-                          "enum": [
-                            "IN_USE",
-                            "NOT_IN_USE"
-                          ]
-                        }
-                      }                    }
-                  },
-                  "callbackUri": {
-                    "description": "String formatted according to IETF RFC 3986.\n",
-                    "type": "string"
-                  },
-                  "_links": {
-                    "description": "Links to resources related to this resource.\n",
-                    "type": "object",
-                    "required": [
-                      "self"
-                    ],
-                    "properties": {
-                      "self": {
-                        "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                        "type": "object",
-                        "required": [
-                          "href"
-                        ],
-                        "properties": {
-                          "href": {
-                            "description": "String formatted according to IETF RFC 3986.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "303": {
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      },
-      "get": {
-        "description": "Query Subscription Information\n\nThe GET method queries the list of active subscriptions of the functional block that invokes the method. It can be used e.g. for resynchronization after error situations.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "filter",
-            "description": "Attribute-based filtering expression according to clause 4.3.2. The VNFM shall support receiving this parameter as part of the  URI query string. The NFVO may supply this parameter.  All attribute names that appear in the PkgmSubscription and in  data types referenced from it shall be supported by the VNFM in  the filter expression.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "nextpage_opaque_marker",
-            "description": "Marker to obtain the next page of a paged response. Shall be  supported by the VNFM if the VNFM supports alternative 2 (paging)  according to clause 4.7.2.1 for this resource.\n",
-            "in": "query",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nThe list of subscriptions was queried successfully. The representations body shall contain in an array the representations of all active subscriptions of the functional block that invokes the method , i.e. zero or more representations of VNF package Management subscriptions as defined in clause 10.5.2.4. If the VNFM supports alternative 2 (paging) according to clause  4.7.2.1 for this resource, inclusion of the Link HTTP header in  this response shall follow the provisions in clause 4.7.2.3.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "Link": {
-                "description": "Reference to other resources. Used for paging in the present document, see clause 4.7.2.1.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              }
-            },
-            "schema": {
-              "type": "array",
-              "items": {
-                "description": "This type represents a subscription related to notifications about VNF package management.\n",
-                "type": "object",
-                "required": [
-                  "id",
-                  "callbackUri",
-                  "_links"
-                ],
-                "properties": {
-                  "id": {
-                    "description": "An identifier with the intention of being globally unique.\n",
-                    "type": "string"
-                  },
-                  "filter": {
-                    "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-                    "type": "object",
-                    "properties": {
-                      "notificationTypes": {
-                        "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-                        "type": "array",
-                        "items": {
-                          "type": "string",
-                          "enum": [
-                            "VnfPackageOnboardingNotification",
-                            "VnfPackageChangeNotification"
-                          ]
-                        }
-                      },
-                      "vnfProductsFromProviders": {
-                        "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "required": [
-                            "vnfProvider"
-                          ],
-                          "properties": {
-                            "vnfProvider": {
-                              "description": "Name of the VNF provider to match.\n",
-                              "type": "string"
-                            },
-                            "vnfProducts": {
-                              "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n",
-                              "type": "array",
-                              "items": {
-                                "type": "object",
-                                "required": [
-                                  "vnfProductName"
-                                ],
-                                "properties": {
-                                  "vnfProductName": {
-                                    "description": "Name of the VNF product to match.\n",
-                                    "type": "string"
-                                  },
-                                  "versions": {
-                                    "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n",
-                                    "type": "array",
-                                    "items": {
-                                      "type": "object",
-                                      "required": [
-                                        "vnfSoftwareVersion"
-                                      ],
-                                      "properties": {
-                                        "vnfSoftwareVersion": {
-                                          "description": "A Version.\n",
-                                          "type": "string"
-                                        },
-                                        "vnfdVersions": {
-                                          "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-                                          "type": "array",
-                                          "items": {
-                                            "description": "A Version.\n",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      },
-                      "vnfdId": {
-                        "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier with the intention of being globally unique.\n",
-                          "type": "string"
-                        }
-                      },
-                      "vnfPkgId": {
-                        "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                        "type": "array",
-                        "items": {
-                          "description": "An identifier with the intention of being globally unique.\n",
-                          "type": "string"
-                        }
-                      },
-                      "operationalState": {
-                        "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                        "type": "string",
-                        "enum": [
-                          "ENABLED",
-                          "DISABLED"
-                        ]
-                      },
-                      "usageState": {
-                        "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n"
-                      }
-                    }
-                  },
-                  "callbackUri": {
-                    "description": "String formatted according to IETF RFC 3986.\n",
-                    "type": "string"
-                  },
-                  "_links": {
-                    "description": "Links to resources related to this resource.\n",
-                    "type": "object",
-                    "required": [
-                      "self"
-                    ],
-                    "properties": {
-                      "self": {
-                        "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                        "type": "object",
-                        "required": [
-                          "href"
-                        ],
-                        "properties": {
-                          "href": {
-                            "description": "String formatted according to IETF RFC 3986.\n",
-                            "type": "string"
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/subscriptions/{subscriptionId}": {
-      "parameters": [
-        {
-          "name": "subscriptionId",
-          "description": "Identifier of this subscription. This identifier can be retrieved from the resource referenced by the \"Location\" HTTP header in the response to a POST request creating a new subscription resource. It can also be retrieved from the \"id\" attribute in the payload body of that response.\n",
-          "in": "path",
-          "type": "string",
-          "required": true
-        }
-      ],
-      "get": {
-        "description": "Query Subscription Information\n\nThe GET method reads an individual subscription.\n",
-        "parameters": [
-          {
-            "name": "Accept",
-            "description": "Content-Types that are acceptable for the response. Reference: IETF RFC 7231\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "200 OK\nRepresentation of the subscription resource.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "This type represents a subscription related to notifications about VNF package management.\n",
-              "type": "object",
-              "required": [
-                "id",
-                "callbackUri",
-                "_links"
-              ],
-              "properties": {
-                "id": {
-                  "description": "An identifier with the intention of being globally unique.\n",
-                  "type": "string"
-                },
-                "filter": {
-                  "description": "This type represents a subscription filter related to notifications related to VNF package management. At a particular nesting level in the filter structure, the following applies: All attributes shall match in order for the filter to match (logical \"and\" between different filter attributes). If an attribute is an array, the attribute shall match if at least one of the values in the array matches (logical \"or\" between the values of one filter attribute).\n",
-                  "type": "object",
-                  "properties": {
-                    "notificationTypes": {
-                      "description": "Match particular notification types. Permitted values: - VnfPackageOnboardingNotification - VnfPackageChangeNotification The permitted values of the \"notificationTypes\" attribute are spelled exactly as the names of the notification types to facilitate automated code generation systems.\n",
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "enum": [
-                          "VnfPackageOnboardingNotification",
-                          "VnfPackageChangeNotification"
-                        ]
-                      }
-                    },
-                    "vnfProductsFromProviders": {
-                      "description": "If present, match VNF packages that contain VNF products from certain providers. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "type": "object",
-                        "required": [
-                          "vnfProvider"
-                        ],
-                        "properties": {
-                          "vnfProvider": {
-                            "description": "Name of the VNF provider to match.\n",
-                            "type": "string"
-                          },
-                          "vnfProducts": {
-                            "description": "If present, match VNF packages that contain VNF products with certain product names, from one particular provider.\n",
-                            "type": "array",
-                            "items": {
-                              "type": "object",
-                              "required": [
-                                "vnfProductName"
-                              ],
-                              "properties": {
-                                "vnfProductName": {
-                                  "description": "Name of the VNF product to match.\n",
-                                  "type": "string"
-                                },
-                                "versions": {
-                                  "description": "If present, match VNF packages that contain VNF products with certain versions and a certain product name, from one particular provider.\n",
-                                  "type": "array",
-                                  "items": {
-                                    "type": "object",
-                                    "required": [
-                                      "vnfSoftwareVersion"
-                                    ],
-                                    "properties": {
-                                      "vnfSoftwareVersion": {
-                                        "description": "A Version.\n",
-                                        "type": "string"
-                                      },
-                                      "vnfdVersions": {
-                                        "description": "If present, match VNF packages that contain VNF products with certain VNFD versions, a certain software version and a certain product name, from one particular provider.\n",
-                                        "type": "array",
-                                        "items": {
-                                          "description": "A Version.\n",
-                                          "type": "string"
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "vnfdId": {
-                      "description": "Match VNF packages with a VNFD identifier listed in the attribute. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    },
-                    "vnfPkgId": {
-                      "description": "Match VNF packages with a package identifier listed in the attribute. May be present if the \"notificationTypes\" attribute contains the value \"VnfPackageChangeNotification\", and shall be absent otherwise. The attributes \"vnfProductsFromProviders\", \"vnfdId\" and \"vnfPkgId\" are alternatives to reference to particular VNF packages in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.\n",
-                      "type": "array",
-                      "items": {
-                        "description": "An identifier with the intention of being globally unique.\n",
-                        "type": "string"
-                      }
-                    },
-                    "operationalState": {
-                      "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                      "type": "string",
-                      "enum": [
-                        "ENABLED",
-                        "DISABLED"
-                      ]
-                    },
-                    "usageState": {
-                      "description": "- IN_USE: VNF instances instantiated from this VNF package exist. - NOT_IN_USE: No existing VNF instance is instantiated from this VNF  package.\n"
-                    }
-                  }
-                },
-                "callbackUri": {
-                  "description": "String formatted according to IETF RFC 3986.\n",
-                  "type": "string"
-                },
-                "_links": {
-                  "description": "Links to resources related to this resource.\n",
-                  "type": "object",
-                  "required": [
-                    "self"
-                  ],
-                  "properties": {
-                    "self": {
-                      "description": "This type represents a link to a resource using an absolute URI. It shall comply with the provisions defined in table  4.4.1.3-1.\n",
-                      "type": "object",
-                      "required": [
-                        "href"
-                      ],
-                      "properties": {
-                        "href": {
-                          "description": "String formatted according to IETF RFC 3986.\n",
-                          "type": "string"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      },
-      "delete": {
-        "description": "Terminate subscription\n\nThe DELETE method terminates an individual subscription.\n",
-        "parameters": [
-          {
-            "name": "Authorization",
-            "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-            "in": "header",
-            "required": false,
-            "type": "string"
-          },
-          {
-            "name": "Version",
-            "description": "Version of the API requested to use when responding to this request.\n",
-            "in": "header",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "204": {
-            "description": "204 NO CONTENT\nThe subscription resource was deleted successfully.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "405": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "416": {
-            "description": "416 RANGE NOT SATISFIABLE\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": [
-                "status",
-                "detail"
-              ],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml
deleted file mode 100644
index 494f628c53..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/pom.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-pkgm</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm-ext-clients</artifactId>
-  <name>ETSI SOL003 VNF Package Management Adapter Ext Clients</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>io.swagger</groupId>
-        <artifactId>swagger-codegen-maven-plugin</artifactId>
-        <version>${version-swagger-codegen}</version>
-        <executions>
-          <execution>
-            <id>etsicatalog-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/ETSI-Catalog-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/etsicatalog</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.pkgm.extclients.etsicatalog.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-              </configOptions>
-            </configuration>
-          </execution>
-          <execution>
-            <id>sol003-packagemanagement-notification-api</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <inputSpec>${basedir}/src/main/resources/SOL003-VNFPackageManagement-Notification-API.json</inputSpec>
-              <language>java</language>
-              <library>okhttp-gson</library>
-              <output>${project.build.directory}/generated-sources/sol003-vnf-packagemanagement/notification</output>
-              <apiPackage>org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.api</apiPackage>
-              <modelPackage>org.onap.so.adapters.etsisol003adapter.pkgm.extclients.vnfm.notification.model</modelPackage>
-              <generateApiTests>false</generateApiTests>
-              <generateModelTests>false</generateModelTests>
-              <configOptions>
-                <sourceFolder>src/gen/java/main</sourceFolder>
-                <withXml>true</withXml>
-                <useRxJava2>true</useRxJava2>
-                <serializableModel>true</serializableModel>
-                <dateLibrary>java8-localdatetime</dateLibrary>
-              </configOptions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${project.basedir}/target/generated-sources/sol003-vnf-packagemanagement/notification/src/gen/java/main</source>
-                <source>${project.basedir}/target/generated-sources/etsicatalog/src/gen/java/main</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-codegen-maven-plugin</artifactId>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                    <versionRange>[2.2.0,)</versionRange>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>${swagger-core-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-gson</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>retrofit</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>converter-scalars</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.oltu.oauth2</groupId>
-      <artifactId>org.apache.oltu.oauth2.client</artifactId>
-      <version>${oltu-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.gsonfire</groupId>
-      <artifactId>gson-fire</artifactId>
-      <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <version>${threetenbp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.reactivex.rxjava2</groupId>
-      <artifactId>rxjava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.retrofit2</groupId>
-      <artifactId>adapter-rxjava2</artifactId>
-      <version>${retrofit-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okio</groupId>
-      <artifactId>okio</artifactId>
-      <version>${okio-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp3-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>logging-interceptor</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>${okhttp-version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/ETSI-Catalog-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/ETSI-Catalog-API.json
deleted file mode 100644
index 35a8c2bd3d..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/ETSI-Catalog-API.json
+++ /dev/null
@@ -1,3121 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "Modeling etsicatalog API",
-    "description": "\n\nThe `swagger-ui` view can be found [here](/api/catalog/v1/swagger).\nThe `ReDoc` view can be found [here](/api/catalog/v1/redoc).\nThe swagger YAML document can be found [here](/api/catalog/v1/swagger.yaml).\nThe swagger JSON document can be found [here](/api/catalog/v1/swagger.json).",
-    "version": "v1"
-  },
-  "host": "127.0.0.1:8806",
-  "schemes": ["http"],
-  "basePath": "/",
-  "consumes": ["application/json"],
-  "produces": ["application/json"],
-  "securityDefinitions": {
-    "Basic": {
-      "type": "basic"
-    }
-  },
-  "security": [{
-    "Basic": []
-  }],
-  "paths": {
-    "/api/catalog/v1/callback_sample": {
-      "get": {
-        "operationId": "api_catalog_v1_callback_sample_list",
-        "description": "Callback Sample.",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "tags": ["Sample interface"]
-      },
-      "parameters": []
-    },
-    "/api/catalog/v1/health_check": {
-      "get": {
-        "operationId": "api_catalog_v1_health_check_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Active"
-          }
-        },
-        "tags": ["Health Check interface"]
-      },
-      "parameters": []
-    },
-    "/api/catalog/v1/jobs/{job_id}": {
-      "get": {
-        "operationId": "api_catalog_v1_jobs_read",
-        "description": "Get job status",
-        "parameters": [{
-          "name": "job_id",
-          "in": "query",
-          "description": "job id",
-          "type": "string"
-        }, {
-          "name": "responseId",
-          "in": "query",
-          "description": "response id",
-          "type": "string"
-        }],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/GetJobResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PostJobResponseResult"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "post": {
-        "operationId": "api_catalog_v1_jobs_create",
-        "description": "Update job status",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/PostJobRequest"
-          }
-        }, {
-          "name": "job_id",
-          "in": "query",
-          "description": "job id",
-          "type": "string"
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PostJobResponseResult"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PostJobResponseResult"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": [{
-        "name": "job_id",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/catalog/v1/mandb/{modelName}": {
-      "get": {
-        "operationId": "api_catalog_v1_mandb_read",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "tags": ["Sample interface"]
-      },
-      "delete": {
-        "operationId": "api_catalog_v1_mandb_delete",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": ""
-          }
-        },
-        "tags": ["Sample interface"]
-      },
-      "parameters": [{
-        "name": "modelName",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/catalog/v1/nspackages": {
-      "get": {
-        "operationId": "api_catalog_v1_nspackages_list",
-        "description": "Query NS packages",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/NsPackage"
-              }
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "post": {
-        "operationId": "api_catalog_v1_nspackages_create",
-        "description": "On distribute NS package",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/NsPackageDistributeRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsPackageDistributeResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": []
-    },
-    "/api/catalog/v1/nspackages/{csarId}": {
-      "get": {
-        "operationId": "api_catalog_v1_nspackages_read",
-        "description": "Query one NS package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsPackage"
-            }
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "delete": {
-        "operationId": "api_catalog_v1_nspackages_delete",
-        "description": "Delete one NS package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsPackageDistributeResponse"
-            }
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": [{
-        "name": "csarId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/catalog/v1/service_packages": {
-      "get": {
-        "operationId": "api_catalog_v1_service_packages_list",
-        "description": "Query Service packages",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/ServicePackage"
-              }
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "post": {
-        "operationId": "api_catalog_v1_service_packages_create",
-        "description": "On distribute Service package",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/ServicePackageDistributeRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": ""
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": []
-    },
-    "/api/catalog/v1/service_packages/{csarId}": {
-      "get": {
-        "operationId": "api_catalog_v1_service_packages_read",
-        "description": "Query one Service package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/ServicePackage"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "delete": {
-        "operationId": "api_catalog_v1_service_packages_delete",
-        "description": "Delete one Service package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "204": {
-            "description": ""
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": [{
-        "name": "csarId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/catalog/v1/vnfpackages": {
-      "get": {
-        "operationId": "api_catalog_v1_vnfpackages_list",
-        "description": "Query Nf packages",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/NfPackage"
-              }
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "post": {
-        "operationId": "api_catalog_v1_vnfpackages_create",
-        "description": "On distribute Nf package",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/NfPackageDistributeRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PostJobResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": []
-    },
-    "/api/catalog/v1/vnfpackages/{csarId}": {
-      "get": {
-        "operationId": "api_catalog_v1_vnfpackages_read",
-        "description": "Query one Nf package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NfPackage"
-            }
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "delete": {
-        "operationId": "api_catalog_v1_vnfpackages_delete",
-        "description": "Delete one Nf package",
-        "parameters": [{
-          "name": "csarId",
-          "in": "query",
-          "description": "csarId",
-          "type": "string"
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PostJobResponse"
-            }
-          },
-          "500": {
-            "description": "error message",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["Catalog interface"]
-      },
-      "parameters": [{
-        "name": "csarId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/nsd/v1/health_check": {
-      "get": {
-        "operationId": "api_nsd_v1_health_check_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Active"
-          }
-        },
-        "tags": ["Health Check interface"]
-      },
-      "parameters": []
-    },
-    "/api/nsd/v1/ns_descriptors": {
-      "get": {
-        "operationId": "api_nsd_v1_ns_descriptors_list",
-        "description": "Query multiple NSDs",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/NsdInfo"
-              }
-            }
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "post": {
-        "operationId": "api_nsd_v1_ns_descriptors_create",
-        "description": "Create a NSD",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/CreateNsdInfoRequest"
-          }
-        }],
-        "responses": {
-          "201": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsdInfo"
-            }
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": []
-    },
-    "/api/nsd/v1/ns_descriptors/{nsdInfoId}": {
-      "get": {
-        "operationId": "api_nsd_v1_ns_descriptors_read",
-        "description": "Query a NSD",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsdInfo"
-            }
-          },
-          "404": {
-            "description": "NSDs do not exist"
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "delete": {
-        "operationId": "api_nsd_v1_ns_descriptors_delete",
-        "description": "Delete a NSD",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No content"
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": [{
-        "name": "nsdInfoId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/nsd/v1/ns_descriptors/{nsdInfoId}/nsd_content": {
-      "get": {
-        "operationId": "api_nsd_v1_ns_descriptors_nsd_content_list",
-        "description": "Download NSD content",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No content"
-          },
-          "404": {
-            "description": "NSD does not exist."
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "put": {
-        "operationId": "api_nsd_v1_ns_descriptors_nsd_content_update",
-        "description": "Upload NSD content",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "PNFD file"
-          },
-          "500": {
-            "description": "Internal error"
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": [{
-        "name": "nsdInfoId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/nsd/v1/pnf_descriptors": {
-      "get": {
-        "operationId": "api_nsd_v1_pnf_descriptors_list",
-        "description": "Query multiple PNFDs",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/PnfdInfo"
-              }
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "post": {
-        "operationId": "api_nsd_v1_pnf_descriptors_create",
-        "description": "Create a  PNFD",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/CreatePnfdInfoRequest"
-          }
-        }],
-        "responses": {
-          "201": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PnfdInfo"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": []
-    },
-    "/api/nsd/v1/pnf_descriptors/{pnfdInfoId}": {
-      "get": {
-        "operationId": "api_nsd_v1_pnf_descriptors_read",
-        "description": "Query a PNFD",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PnfdInfo"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "delete": {
-        "operationId": "api_nsd_v1_pnf_descriptors_delete",
-        "description": "Delete a PNFD",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No content"
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": [{
-        "name": "pnfdInfoId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/nsd/v1/pnf_descriptors/{pnfdInfoId}/pnfd_content": {
-      "get": {
-        "operationId": "Fetch PNFD content",
-        "description": "Fetch PNFD content",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "PNFD file",
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "produces": ["application/octet-stream", "application/json"],
-        "tags": ["NSD Management interface"]
-      },
-      "put": {
-        "operationId": "api_nsd_v1_pnf_descriptors_pnfd_content_update",
-        "description": "Upload PNFD content",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No content"
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": [{
-        "name": "pnfdInfoId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/nsd/v1/subscriptions": {
-      "get": {
-        "operationId": "api_nsd_v1_subscriptions_list",
-        "description": "Query subscriptions for Nsd Management",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/NsdmSubscription"
-              }
-            }
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "post": {
-        "operationId": "api_nsd_v1_subscriptions_create",
-        "description": "Create Subscription for NSD Management",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/NsdmSubscriptionRequest"
-          }
-        }],
-        "responses": {
-          "201": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsdmSubscription"
-            }
-          },
-          "303": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": []
-    },
-    "/api/nsd/v1/subscriptions/{subscriptionId}": {
-      "get": {
-        "operationId": "api_nsd_v1_subscriptions_read",
-        "description": "Query subscriptions for Nsd Management",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/NsdmSubscription"
-            }
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "delete": {
-        "operationId": "api_nsd_v1_subscriptions_delete",
-        "description": "Delete subscription for Nsd Management",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No_Content"
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["NSD Management interface"]
-      },
-      "parameters": [{
-        "name": "subscriptionId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/parser/v1/health_check": {
-      "get": {
-        "operationId": "api_parser_v1_health_check_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Active"
-          }
-        },
-        "tags": ["Health Check interface"]
-      },
-      "parameters": []
-    },
-    "/api/parser/v1/parser": {
-      "post": {
-        "operationId": "api_parser_v1_parser_create",
-        "description": "Parse model(NS, Service, VNF, PNF)",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/ParseModelRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/ParseModelResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Parser interface"]
-      },
-      "parameters": []
-    },
-    "/api/parser/v1/parsernsd": {
-      "post": {
-        "operationId": "api_parser_v1_parsernsd_create",
-        "description": "Parse NS model",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/ParseModelRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/ParseModelResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Parser interface"]
-      },
-      "parameters": []
-    },
-    "/api/parser/v1/parserpnfd": {
-      "post": {
-        "operationId": "api_parser_v1_parserpnfd_create",
-        "description": "Parse PNF model",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/ParseModelRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/ParseModelResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Parser interface"]
-      },
-      "parameters": []
-    },
-    "/api/parser/v1/parservnfd": {
-      "post": {
-        "operationId": "api_parser_v1_parservnfd_create",
-        "description": "Parse NF model",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/ParseModelRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/ParseModelResponse"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/InternalErrorRequest"
-            }
-          }
-        },
-        "tags": ["Parser interface"]
-      },
-      "parameters": []
-    },
-    "/api/vnfpkgm/v1/health_check": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_health_check_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Active"
-          }
-        },
-        "tags": ["Health Check interface"]
-      },
-      "parameters": []
-    },
-    "/api/vnfpkgm/v1/subscriptions": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_subscriptions_list",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PkgmSubscription"
-            }
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "post": {
-        "operationId": "api_vnfpkgm_v1_subscriptions_create",
-        "description": "",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/PkgmSubscriptionRequest"
-          }
-        }],
-        "responses": {
-          "201": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PkgmSubscription"
-            }
-          },
-          "400": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": []
-    },
-    "/api/vnfpkgm/v1/subscriptions/{subscriptionId}": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_subscriptions_read",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/PkgmSubscription"
-            }
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "delete": {
-        "operationId": "api_vnfpkgm_v1_subscriptions_delete",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": ""
-          },
-          "404": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          },
-          "500": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/SUBSCRIPTION_ProblemDetailsSerializer"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "subscriptionId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/vnfpkgm/v1/vnf_packages": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_list",
-        "description": "Query multiple VNF package resource",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/VnfPkgInfo"
-              }
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "post": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_create",
-        "description": "Create an individual VNF package resource",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/CreateVnfPkgInfoRequest"
-          }
-        }],
-        "responses": {
-          "201": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/VnfPkgInfo"
-            }
-          },
-          "400": {
-            "description": "Bad Request",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": []
-    },
-    "/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_read",
-        "description": "Query an individual VNF package resource",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "",
-            "schema": {
-              "$ref": "#/definitions/VnfPkgInfo"
-            }
-          },
-          "404": {
-            "description": "VNF package does not exist",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "delete": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_delete",
-        "description": "Delete an individual VNF package resource",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": "No content"
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "vnfPkgId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}/artifacts/{artifactPath}": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_artifacts_read",
-        "description": "",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "Return the artifact file",
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          },
-          "404": {
-            "description": "Artifact not found",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "produces": ["application/octet-stream", "application/json"],
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "artifactPath",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }, {
-        "name": "vnfPkgId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}/package_content": {
-      "get": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_package_content_list",
-        "description": "Fetch VNF package content",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "VNF package file",
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          },
-          "404": {
-            "description": "VNF package does not exist",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "produces": ["application/octet-stream", "application/json"],
-        "tags": ["VNF Package Management interface"]
-      },
-      "put": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_package_content_update",
-        "description": "Upload VNF package content",
-        "parameters": [],
-        "responses": {
-          "202": {
-            "description": "Successfully"
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "vnfPkgId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}/package_content/upload_from_uri": {
-      "post": {
-        "operationId": "api_vnfpkgm_v1_vnf_packages_package_content_upload_from_uri_create",
-        "description": "Upload VNF package content from uri",
-        "parameters": [{
-          "name": "data",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "$ref": "#/definitions/UploadVnfPackageFromUriRequest"
-          }
-        }],
-        "responses": {
-          "202": {
-            "description": "Successfully"
-          },
-          "400": {
-            "description": "Bad Request",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "vnfPkgId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}/vnfd": {
-      "get": {
-        "operationId": "VNFD of an on-boarded VNF package",
-        "description": "Read VNFD of an on-boarded VNF package",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "VNFD of an on-boarded VNF package",
-            "schema": {
-              "type": "string",
-              "format": "binary"
-            }
-          },
-          "404": {
-            "description": "VNF package does not exist",
-            "schema": {
-              "type": "string"
-            }
-          },
-          "500": {
-            "description": "Internal error",
-            "schema": {
-              "type": "string"
-            }
-          }
-        },
-        "produces": ["application/octet-stream", "application/json"],
-        "tags": ["VNF Package Management interface"]
-      },
-      "parameters": [{
-        "name": "vnfPkgId",
-        "in": "path",
-        "required": true,
-        "type": "string"
-      }]
-    },
-    "/samples/": {
-      "get": {
-        "operationId": "samples_list",
-        "description": "List all samples.",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "tags": ["Sample interface"]
-      },
-      "parameters": []
-    }
-  },
-  "definitions": {
-    "JobResponseHistoryList": {
-      "description": "Response History List",
-      "type": "object",
-      "properties": {
-        "status": {
-          "title": "Status",
-          "description": "Status",
-          "type": "string",
-          "minLength": 1
-        },
-        "progress": {
-          "title": "Progress",
-          "description": "Job Progress",
-          "type": "string",
-          "minLength": 1
-        },
-        "statusDescription": {
-          "title": "Statusdescription",
-          "description": "Status Description",
-          "type": "string",
-          "minLength": 1
-        },
-        "errorCode": {
-          "title": "Errorcode",
-          "description": "Error Code",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "responseId": {
-          "title": "Responseid",
-          "description": "Response Id",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "JobResponseDescriptor": {
-      "title": "Responsedescriptor",
-      "description": "Job Response Descriptor",
-      "type": "object",
-      "properties": {
-        "status": {
-          "title": "Status",
-          "description": "Status",
-          "type": "string",
-          "minLength": 1
-        },
-        "progress": {
-          "title": "Progress",
-          "description": "Job Progress",
-          "type": "string",
-          "minLength": 1
-        },
-        "statusDescription": {
-          "title": "Statusdescription",
-          "description": "Status Description",
-          "type": "string",
-          "minLength": 1
-        },
-        "errorCode": {
-          "title": "Errorcode",
-          "description": "Error Code",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "responseId": {
-          "title": "Responseid",
-          "description": "Response Id",
-          "type": "string",
-          "minLength": 1
-        },
-        "responseHistoryList": {
-          "description": "Response History List",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/JobResponseHistoryList"
-          }
-        }
-      }
-    },
-    "GetJobResponse": {
-      "type": "object",
-      "properties": {
-        "jobId": {
-          "title": "Jobid",
-          "description": "Job Id",
-          "type": "string",
-          "minLength": 1
-        },
-        "responseDescriptor": {
-          "$ref": "#/definitions/JobResponseDescriptor"
-        }
-      }
-    },
-    "PostJobResponseResult": {
-      "required": ["result"],
-      "type": "object",
-      "properties": {
-        "result": {
-          "title": "Result",
-          "description": "Result",
-          "type": "string",
-          "minLength": 1
-        },
-        "msg": {
-          "title": "Msg",
-          "description": "Message",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "PostJobRequest": {
-      "type": "object",
-      "properties": {
-        "progress": {
-          "title": "Progress",
-          "description": "Job Progress",
-          "type": "string",
-          "minLength": 1
-        },
-        "desc": {
-          "title": "Desc",
-          "description": "Description",
-          "type": "string",
-          "minLength": 1
-        },
-        "errcode": {
-          "title": "Errcode",
-          "description": "Error Code",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NsPackageInfo": {
-      "title": "Packageinfo",
-      "description": "NS Package Info",
-      "type": "object",
-      "properties": {
-        "nsdId": {
-          "title": "Nsdid",
-          "description": "NSD ID",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "nsPackageId": {
-          "title": "Nspackageid",
-          "description": "NS Package ID",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdProvider": {
-          "title": "Nsdprovider",
-          "description": "NSD Provider",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdVersion": {
-          "title": "Nsdversion",
-          "description": "NSD Version",
-          "type": "string",
-          "x-nullable": true
-        },
-        "csarName": {
-          "title": "Csarname",
-          "description": "CSAR name",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdModel": {
-          "title": "Nsdmodel",
-          "description": "NSD Model",
-          "type": "string",
-          "x-nullable": true
-        },
-        "downloadUrl": {
-          "title": "Downloadurl",
-          "description": "URL to download NSD Model",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        }
-      },
-      "x-nullable": true
-    },
-    "NsPackage": {
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "CSAR ID",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "packageInfo": {
-          "$ref": "#/definitions/NsPackageInfo"
-        }
-      }
-    },
-    "InternalErrorRequest": {
-      "required": ["error"],
-      "type": "object",
-      "properties": {
-        "error": {
-          "title": "Error",
-          "description": "Error",
-          "type": "string",
-          "minLength": 1
-        },
-        "errorMessage": {
-          "title": "Errormessage",
-          "description": "Error Message",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NsPackageDistributeRequest": {
-      "required": ["csarId"],
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "csarId",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NsPackageDistributeResponse": {
-      "required": ["status", "statusDescription", "errorCode"],
-      "type": "object",
-      "properties": {
-        "status": {
-          "title": "Status",
-          "description": "status",
-          "type": "string",
-          "minLength": 1
-        },
-        "statusDescription": {
-          "title": "Statusdescription",
-          "description": "statusDescription",
-          "type": "string",
-          "minLength": 1
-        },
-        "errorCode": {
-          "title": "Errorcode",
-          "description": "errorCode",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "ServicePackageInfo": {
-      "title": "Packageinfo",
-      "description": "Service Package Info",
-      "type": "object",
-      "properties": {
-        "servicedId": {
-          "title": "Servicedid",
-          "description": "ServiceD ID",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "servicePackageId": {
-          "title": "Servicepackageid",
-          "description": "Service Package ID",
-          "type": "string",
-          "x-nullable": true
-        },
-        "servicedProvider": {
-          "title": "Servicedprovider",
-          "description": "ServiceD Provider",
-          "type": "string",
-          "x-nullable": true
-        },
-        "servicedVersion": {
-          "title": "Servicedversion",
-          "description": "ServiceD Version",
-          "type": "string",
-          "x-nullable": true
-        },
-        "csarName": {
-          "title": "Csarname",
-          "description": "CSAR name",
-          "type": "string",
-          "x-nullable": true
-        },
-        "servicedModel": {
-          "title": "Servicedmodel",
-          "description": "ServiceD Model",
-          "type": "string",
-          "x-nullable": true
-        },
-        "downloadUrl": {
-          "title": "Downloadurl",
-          "description": "URL to download ServiceD Model",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        }
-      },
-      "x-nullable": true
-    },
-    "ServicePackage": {
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "CSAR ID",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "packageInfo": {
-          "$ref": "#/definitions/ServicePackageInfo"
-        }
-      }
-    },
-    "ServicePackageDistributeRequest": {
-      "required": ["csarId"],
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "csarId",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NfPackageInfo": {
-      "title": "Packageinfo",
-      "description": "VNF Package Info",
-      "required": ["vnfPackageId"],
-      "type": "object",
-      "properties": {
-        "vnfdId": {
-          "title": "Vnfdid",
-          "description": "VNFD ID",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfPackageId": {
-          "title": "Vnfpackageid",
-          "description": "VNF Package ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "vnfdProvider": {
-          "title": "Vnfdprovider",
-          "description": "VNFD Provider",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfdVersion": {
-          "title": "Vnfdversion",
-          "description": "VNFD Version",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfVersion": {
-          "title": "Vnfversion",
-          "description": "VNF Version",
-          "type": "string",
-          "x-nullable": true
-        },
-        "csarName": {
-          "title": "Csarname",
-          "description": "CSAR Name",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfdModel": {
-          "title": "Vnfdmodel",
-          "description": "VNFD Model",
-          "type": "string",
-          "x-nullable": true
-        },
-        "downloadUrl": {
-          "title": "Downloadurl",
-          "description": "URL to download VNFD Model",
-          "type": "string",
-          "x-nullable": true
-        }
-      }
-    },
-    "NfImageInfo": {
-      "description": "Image Info",
-      "required": ["index", "fileName", "imageId", "vimId", "vimUser", "tenant", "status"],
-      "type": "object",
-      "properties": {
-        "index": {
-          "title": "Index",
-          "description": "Index of VNF Image",
-          "type": "string",
-          "minLength": 1
-        },
-        "fileName": {
-          "title": "Filename",
-          "description": "Image file name",
-          "type": "string",
-          "minLength": 1
-        },
-        "imageId": {
-          "title": "Imageid",
-          "description": "Image ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "vimId": {
-          "title": "Vimid",
-          "description": "VIM ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "vimUser": {
-          "title": "Vimuser",
-          "description": "User of VIM",
-          "type": "string",
-          "minLength": 1
-        },
-        "tenant": {
-          "title": "Tenant",
-          "description": "Tenant",
-          "type": "string",
-          "minLength": 1
-        },
-        "status": {
-          "title": "Status",
-          "description": "Status",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NfPackage": {
-      "required": ["csarId", "packageInfo"],
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "CSAR ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "packageInfo": {
-          "$ref": "#/definitions/NfPackageInfo"
-        },
-        "imageInfo": {
-          "description": "Image Info",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/NfImageInfo"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "NfPackageDistributeRequest": {
-      "required": ["csarId"],
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "CSAR ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "vimIds": {
-          "description": "A string for vimIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "labVimId": {
-          "title": "Labvimid",
-          "description": "A list of VIM IDs.",
-          "type": "string"
-        }
-      }
-    },
-    "PostJobResponse": {
-      "required": ["jobId"],
-      "type": "object",
-      "properties": {
-        "jobId": {
-          "title": "Jobid",
-          "description": "jobId",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "ProblemDetails": {
-      "title": "Onboardingfailuredetails",
-      "description": "Failure details of current onboarding procedure.It shall be present when the nsdOnboardingState attribute is CREATED and the uploading or processing fails in NFVO.",
-      "required": ["title", "detail"],
-      "type": "object",
-      "properties": {
-        "type": {
-          "title": "Type",
-          "description": "A URI reference according to IETF RFC 3986 [10] that identifies the problem type.         It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced.         When this member is not present, its value is assumed to be \"about:blank\".",
-          "type": "string",
-          "x-nullable": true
-        },
-        "title": {
-          "title": "Title",
-          "description": "The HTTP status code for this occurrence of the problem.",
-          "type": "integer"
-        },
-        "detail": {
-          "title": "Detail",
-          "description": "A human-readable explanation specific to this occurrence of the problem.",
-          "type": "string",
-          "minLength": 1
-        },
-        "instance": {
-          "title": "Instance",
-          "description": "A URI reference that identifies the specific occurrence of the problem.         It may yield further information if dereferenced.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "additional_attributes": {
-          "title": "Additional attributes",
-          "description": "Any number of additional attributes, as defined in a specification or by an implementation.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "Additional attribute",
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "UriLink": {
-      "title": "Self",
-      "description": "URI of this resource.",
-      "required": ["href"],
-      "type": "object",
-      "properties": {
-        "href": {
-          "title": "Href",
-          "description": "URI of the referenced resource",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "NSD_LinkSerializer": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "required": ["self", "nsd_content"],
-      "type": "object",
-      "properties": {
-        "self": {
-          "$ref": "#/definitions/UriLink"
-        },
-        "nsd_content": {
-          "$ref": "#/definitions/UriLink"
-        }
-      }
-    },
-    "NsdInfo": {
-      "required": ["id", "nsdOnboardingState", "nsdOperationalState", "nsdUsageState", "_links"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of the onboarded individual NS descriptor resource.This identifier is allocated by the NFVO.",
-          "type": "string",
-          "minLength": 1
-        },
-        "nsdId": {
-          "title": "Nsdid",
-          "description": "This identifier, which is allocated by the NSD designer,identifies the NSD in a globally unique way.It is copied from the NSD content and shall be present after the NSD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdName": {
-          "title": "Nsdname",
-          "description": "Name of the onboarded NSD.This information is copied from the NSD content and shall be present after the NSD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdVersion": {
-          "title": "Nsdversion",
-          "description": "Version of the on-boarded NSD.This information is copied from the NSD content and shall be present after the NSD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdDesigner": {
-          "title": "Nsddesigner",
-          "description": "Designer of the on-boarded NSD.This information is copied from the NSD content and shall be present after the NSD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "nsdInvariantId": {
-          "title": "Nsdinvariantid",
-          "description": "This identifier, which is allocated by the NSD designer,identifies an NSD in a version independent manner.This information is copied from the NSD content and shall be present after the NSD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfPkgIds": {
-          "description": "Identifies the VNF package for the VNFD referenced by the on-boarded NS descriptor resource.",
-          "type": "array",
-          "items": {
-            "description": "Identifier of the VNF package",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "pnfdInfoIds": {
-          "description": "Identifies the PnfdInfo element for the PNFD referenced by the on-boarded NS descriptor resource.",
-          "type": "array",
-          "items": {
-            "description": "Identifier of the PnfdInfo element",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "nestedNsdInfoIds": {
-          "description": "Identifies the NsdInfo element for the nested NSD referenced by the on-boarded NS descriptor resource.",
-          "type": "array",
-          "items": {
-            "description": "Identifier of the NsdInfo element",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "nsdOnboardingState": {
-          "title": "Nsdonboardingstate",
-          "description": "Onboarding state of the individual NS descriptor resource.",
-          "type": "string",
-          "enum": ["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"]
-        },
-        "onboardingFailureDetails": {
-          "$ref": "#/definitions/ProblemDetails"
-        },
-        "nsdOperationalState": {
-          "title": "Nsdoperationalstate",
-          "description": "Operational state of the individual NS descriptor resource.This attribute can be modified with the PATCH method.",
-          "type": "string",
-          "enum": ["ENABLED", "DISABLED"]
-        },
-        "nsdUsageState": {
-          "title": "Nsdusagestate",
-          "description": "Usage state of the individual NS descriptor resource.",
-          "type": "string",
-          "enum": ["IN_USE", "NOT_IN_USE"]
-        },
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User defined data for the individual NS descriptor resource.This attribute can be modified with the PATCH method.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "Key Value Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "_links": {
-          "$ref": "#/definitions/NSD_LinkSerializer"
-        }
-      }
-    },
-    "CreateNsdInfoRequest": {
-      "type": "object",
-      "properties": {
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User-defined data for the NS descriptor resource to be created.It shall be present when the user defined data is set for the individual NS descriptor resource to be created.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "Key Value Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "PNFD_LinkSerializer": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "required": ["self", "pnfd_content"],
-      "type": "object",
-      "properties": {
-        "self": {
-          "$ref": "#/definitions/UriLink"
-        },
-        "pnfd_content": {
-          "$ref": "#/definitions/UriLink"
-        }
-      }
-    },
-    "PnfdInfo": {
-      "required": ["id", "pnfdOnboardingState", "pnfdUsageState", "_links"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of the onboarded individual PNF descriptor resource.         This identifier is allocated by the NFVO.",
-          "type": "string",
-          "minLength": 1
-        },
-        "pnfdId": {
-          "title": "Pnfdid",
-          "description": "This identifier, which is allocated by the PNFD designer,         identifies the PNFD in a globally unique way.         It is copied from the PNFD content and shall be present after the PNFD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "pnfdName": {
-          "title": "Pnfdname",
-          "description": "Name of the onboarded PNFD.         This information is copied from the PNFD content and shall be present after the PNFD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "pnfdVersion": {
-          "title": "Pnfdversion",
-          "description": "Version of the on-boarded PNFD.         This information is copied from the PNFD content and shall be present after the PNFD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "pnfdProvider": {
-          "title": "Pnfdprovider",
-          "description": "Provider of the on-boarded PNFD.         This information is copied from the PNFD content and shall be present after the PNFD content is on-boarded.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "pnfdInvariantId": {
-          "title": "Pnfdinvariantid",
-          "description": "Identifies a PNFD in a version independent manner.         This attribute is invariant across versions of PNFD.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "pnfdOnboardingState": {
-          "title": "Pnfdonboardingstate",
-          "description": "Onboarding state of the individual PNF descriptor resource.",
-          "type": "string",
-          "enum": ["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"]
-        },
-        "onboardingFailureDetails": {
-          "$ref": "#/definitions/ProblemDetails"
-        },
-        "pnfdUsageState": {
-          "title": "Pnfdusagestate",
-          "description": "Usage state of the individual PNF descriptor resource.",
-          "type": "string",
-          "enum": ["IN_USE", "NOT_IN_USE"]
-        },
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User defined data for the individual PNF descriptor resource.         This attribute can be modified with the PATCH method.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "Key Value Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "_links": {
-          "$ref": "#/definitions/PNFD_LinkSerializer"
-        }
-      }
-    },
-    "SUBSCRIPTION_ProblemDetailsSerializer": {
-      "required": ["status", "detail"],
-      "type": "object",
-      "properties": {
-        "type": {
-          "title": "Type",
-          "description": "Type",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "title": {
-          "title": "Title",
-          "description": "Title",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "status": {
-          "title": "Status",
-          "description": "Status",
-          "type": "integer"
-        },
-        "detail": {
-          "title": "Detail",
-          "description": "Detail",
-          "type": "string",
-          "minLength": 1
-        },
-        "instance": {
-          "title": "Instance",
-          "description": "Instance",
-          "type": "string",
-          "minLength": 1,
-          "x-nullable": true
-        },
-        "additional_details": {
-          "description": "Any number of additional attributes, as defined in a specification or by an implementation.",
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "CreatePnfdInfoRequest": {
-      "type": "object",
-      "properties": {
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User-defined data for the PNF descriptor resource to be created.It shall be present when the user defined data is set for the individual PNF descriptor resource to be created.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "Key Value Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "NsdmNotificationsFilter": {
-      "title": "Filter",
-      "description": "Filter settings for this subscription, to define the of all notifications this subscription relates to.",
-      "type": "object",
-      "properties": {
-        "notificationTypes": {
-          "description": "Match particular notification types",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["NsdOnBoardingNotification", "NsdOnboardingFailureNotification", "NsdChangeNotification", "NsdDeletionNotification", "PnfdOnBoardingNotification", "PnfdOnBoardingFailureNotification", "PnfdDeletionNotification"]
-          }
-        },
-        "nsdInfoId": {
-          "description": "Match NS packages with particular nsdInfoIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "nsdId": {
-          "description": "Match NS Packages with particular nsdIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "nsdName": {
-          "description": "Match NS Packages with particular nsdNames",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "maxLength": 255,
-            "minLength": 1
-          }
-        },
-        "nsdVersion": {
-          "description": "match NS packages that belong to certain nsdversion",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "maxLength": 255,
-            "minLength": 1
-          }
-        },
-        "nsdInvariantId": {
-          "description": "Match NS Packages with particular nsdInvariantIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "vnfPkgIds": {
-          "description": "Match NS Packages that has VNF PackageIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "nestedNsdInfoIds": {
-          "description": "Match NS Packages with particular nsdInvariantIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "nsdOnboardingState": {
-          "description": "Match NS Packages with particular NS Onboarding State",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"]
-          }
-        },
-        "nsdOperationalState": {
-          "description": "Match NS Packages with particular NS Operational State",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["ENABLED", "DISABLED"]
-          }
-        },
-        "nsdUsageState": {
-          "description": "Match NS Packages with particular NS Usage State",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["IN_USE", "NOT_IN_USE"]
-          }
-        },
-        "pnfdInfoIds": {
-          "description": "Match PF packages with particular pnfdInfoIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "pnfdId": {
-          "description": "Match PF packages with particular pnfdInfoIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "pnfdName": {
-          "description": "Match PF Packages with particular pnfdNames",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "maxLength": 255,
-            "minLength": 1
-          }
-        },
-        "pnfdVersion": {
-          "description": "match PF packages that belong to certain pnfd version",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "maxLength": 255,
-            "minLength": 1
-          }
-        },
-        "pnfdProvider": {
-          "description": "Match PF Packages with particular pnfdProvider",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "maxLength": 255,
-            "minLength": 1
-          }
-        },
-        "pnfdInvariantId": {
-          "description": "Match PF Packages with particular pnfdInvariantIds",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "pnfdOnboardingState": {
-          "description": "Match PF Packages with particular PNF Onboarding State ",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"]
-          }
-        },
-        "pnfdUsageState": {
-          "description": "Match PF Packages with particular PNF usage State",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["IN_USE", "NOT_IN_USE"]
-          }
-        }
-      }
-    },
-    "NSDM_SUB_LinkSerializer": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "required": ["self"],
-      "type": "object",
-      "properties": {
-        "self": {
-          "$ref": "#/definitions/UriLink"
-        }
-      }
-    },
-    "NsdmSubscription": {
-      "required": ["id", "callbackUri", "_links"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of this subscription resource.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "callbackUri": {
-          "title": "Callbackuri",
-          "description": "The URI of the endpoint to send the notification to.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "filter": {
-          "$ref": "#/definitions/NsdmNotificationsFilter"
-        },
-        "_links": {
-          "$ref": "#/definitions/NSDM_SUB_LinkSerializer"
-        }
-      }
-    },
-    "BasicAuth": {
-      "title": "Paramsbasic",
-      "description": "Parameters for authentication/authorization using BASIC.",
-      "type": "object",
-      "properties": {
-        "userName": {
-          "title": "Username",
-          "description": "Username to be used in HTTP Basic authentication.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "password": {
-          "title": "Password",
-          "description": "Password to be used in HTTP Basic authentication.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        }
-      }
-    },
-    "OAuthCredentials": {
-      "title": "Paramsoauth2clientcredentials",
-      "description": "Parameters for authentication/authorization using OAUTH2_CLIENT_CREDENTIALS.",
-      "type": "object",
-      "properties": {
-        "clientId": {
-          "title": "Clientid",
-          "description": "Client identifier to be used in the access token request of the OAuth 2.0 client credentials grant type.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "clientPassword": {
-          "title": "Clientpassword",
-          "description": "Client password to be used in the access token request of the OAuth 2.0 client credentials grant type.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "tokenEndpoint": {
-          "title": "Tokenendpoint",
-          "description": "The token endpoint from which the access token can be obtained.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        }
-      }
-    },
-    "SubscriptionAuthentication": {
-      "title": "Authentication",
-      "description": "Authentication parameters to configure the use of Authorization when sending notifications corresponding to this subscription.",
-      "required": ["authType"],
-      "type": "object",
-      "properties": {
-        "authType": {
-          "description": "Defines the types of Authentication / Authorization which the API consumer is willing to accept when receiving a notification.",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["BASIC", "OAUTH2_CLIENT_CREDENTIALS", "TLS_CERT"]
-          }
-        },
-        "paramsBasic": {
-          "$ref": "#/definitions/BasicAuth"
-        },
-        "paramsOauth2ClientCredentials": {
-          "$ref": "#/definitions/OAuthCredentials"
-        }
-      }
-    },
-    "NsdmSubscriptionRequest": {
-      "required": ["callbackUri"],
-      "type": "object",
-      "properties": {
-        "callbackUri": {
-          "title": "Callbackuri",
-          "description": "The URI of the endpoint to send the notification to.",
-          "type": "string",
-          "minLength": 1
-        },
-        "filter": {
-          "$ref": "#/definitions/NsdmNotificationsFilter"
-        },
-        "authentication": {
-          "$ref": "#/definitions/SubscriptionAuthentication"
-        }
-      }
-    },
-    "ParseModelRequest": {
-      "required": ["csarId"],
-      "type": "object",
-      "properties": {
-        "csarId": {
-          "title": "Csarid",
-          "description": "CSAR ID",
-          "type": "string",
-          "minLength": 1
-        },
-        "packageType": {
-          "title": "Packagetype",
-          "description": "Package type: VNF, PNF, NS, Service",
-          "type": "string",
-          "minLength": 1
-        },
-        "inputs": {
-          "title": "Inputs",
-          "description": "Inputs",
-          "type": "object"
-        }
-      }
-    },
-    "ParseModelResponse": {
-      "required": ["model"],
-      "type": "object",
-      "properties": {
-        "model": {
-          "title": "Model",
-          "description": "Model",
-          "type": "object"
-        }
-      }
-    },
-    "VNF_SUBSCRIPTION_LINKSERIALIZER": {
-      "title": "Self",
-      "description": "URI of this resource.",
-      "required": ["href"],
-      "type": "object",
-      "properties": {
-        "href": {
-          "title": "Href",
-          "description": "URI of the referenced resource.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "LinkSelf": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "required": ["self"],
-      "type": "object",
-      "properties": {
-        "self": {
-          "$ref": "#/definitions/VNF_SUBSCRIPTION_LINKSERIALIZER"
-        }
-      }
-    },
-    "Version": {
-      "required": ["vnfSoftwareVersion"],
-      "type": "object",
-      "properties": {
-        "vnfSoftwareVersion": {
-          "title": "Vnfsoftwareversion",
-          "description": "VNF software version to match.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "vnfdVersions": {
-          "description": "Match VNF packages that contain VNF products with certain VNFD versions",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        }
-      }
-    },
-    "vnfProducts": {
-      "required": ["vnfProductName"],
-      "type": "object",
-      "properties": {
-        "vnfProductName": {
-          "title": "Vnfproductname",
-          "description": "Name of the VNF product to match.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "versions": {
-          "description": "match VNF packages that contain VNF products with certain versions",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/Version"
-          }
-        }
-      }
-    },
-    "vnfProductsProviders": {
-      "required": ["vnfProvider"],
-      "type": "object",
-      "properties": {
-        "vnfProvider": {
-          "title": "Vnfprovider",
-          "description": "Name of the VNFprovider to match.",
-          "type": "string",
-          "maxLength": 255,
-          "minLength": 1
-        },
-        "vnfProducts": {
-          "description": "match VNF packages that contain VNF products with certain product names, from one particular provider",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/vnfProducts"
-          }
-        }
-      }
-    },
-    "PkgmNotificationsFilter": {
-      "title": "Filter",
-      "description": "Filter settings for this subscription, to define the subset of all notifications this subscription relates to",
-      "type": "object",
-      "properties": {
-        "notificationTypes": {
-          "description": "Match particular notification types",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["VnfPackageOnboardingNotification", "VnfPackageChangeNotification"]
-          }
-        },
-        "vnfProductsFromProviders": {
-          "description": "Match VNF packages that contain VNF products from certain providers.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/vnfProductsProviders"
-          }
-        },
-        "vnfdId": {
-          "description": "Match VNF packages with a VNFD identifierlisted in the attribute",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "vnfPkgId": {
-          "description": "Match VNF packages with a VNFD identifierlisted in the attribute",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          }
-        },
-        "operationalState": {
-          "description": "Operational state of the VNF package.",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["ENABLED", "DISABLED"]
-          }
-        },
-        "usageState": {
-          "description": "Operational state of the VNF package.",
-          "type": "array",
-          "items": {
-            "type": "string",
-            "enum": ["IN_USE", "NOT_IN_USE"]
-          }
-        }
-      }
-    },
-    "PkgmSubscription": {
-      "required": ["id", "callbackUri", "_links"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of this subscription resource.",
-          "type": "string",
-          "minLength": 1
-        },
-        "callbackUri": {
-          "title": "Callbackuri",
-          "description": "The URI of the endpoint to send the notification to.",
-          "type": "string",
-          "format": "uri",
-          "minLength": 1
-        },
-        "_links": {
-          "$ref": "#/definitions/LinkSelf"
-        },
-        "filter": {
-          "$ref": "#/definitions/PkgmNotificationsFilter"
-        }
-      }
-    },
-    "PkgmSubscriptionRequest": {
-      "required": ["callbackUri"],
-      "type": "object",
-      "properties": {
-        "filter": {
-          "$ref": "#/definitions/PkgmNotificationsFilter"
-        },
-        "callbackUri": {
-          "title": "Callbackuri",
-          "description": "Callback URI to sendthe notification",
-          "type": "string",
-          "format": "uri",
-          "minLength": 1
-        },
-        "authentication": {
-          "$ref": "#/definitions/SubscriptionAuthentication"
-        }
-      }
-    },
-    "Checksum": {
-      "title": "Checksum",
-      "description": "Checksum of the on-boarded VNF package.",
-      "required": ["algorithm", "hash"],
-      "type": "object",
-      "properties": {
-        "algorithm": {
-          "title": "Algorithm",
-          "description": "Name of the algorithm used to generate the checksum.",
-          "type": "string",
-          "minLength": 1
-        },
-        "hash": {
-          "title": "Hash",
-          "description": "The hexadecimal value of the checksum.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "VnfPackageSoftwareImageInfo": {
-      "description": "Information about VNF package artifacts that are software images.",
-      "required": ["id", "name", "provider", "version", "checksum", "containerFormat", "diskFormat", "createdAt", "minDisk", "minRam", "size", "imagePath"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of the software image.",
-          "type": "string",
-          "minLength": 1
-        },
-        "name": {
-          "title": "Name",
-          "description": "Name of the software image.",
-          "type": "string",
-          "minLength": 1
-        },
-        "provider": {
-          "title": "Provider",
-          "description": "Provider of the software image.",
-          "type": "string",
-          "minLength": 1
-        },
-        "version": {
-          "title": "Version",
-          "description": "Version of the software image.",
-          "type": "string",
-          "minLength": 1
-        },
-        "checksum": {
-          "$ref": "#/definitions/Checksum"
-        },
-        "containerFormat": {
-          "title": "Containerformat",
-          "description": "terminationType: Indicates whether forceful or graceful termination is requested.",
-          "type": "string",
-          "enum": ["AKI", "AMI", "ARI", "BARE", "DOCKER", "OVA", "OVF"]
-        },
-        "diskFormat": {
-          "title": "Diskformat",
-          "description": "Disk format of a software image is the format of the underlying disk image.",
-          "type": "string",
-          "enum": ["AKI", "AMI", "ARI", "ISO", "QCOW2", "RAW", "VDI", "VHD", "VHDX", "VMDK"]
-        },
-        "createdAt": {
-          "title": "Createdat",
-          "description": "Time when this software image was created.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "minDisk": {
-          "title": "Mindisk",
-          "description": "The minimal disk for this software image in bytes.",
-          "type": "integer"
-        },
-        "minRam": {
-          "title": "Minram",
-          "description": "The minimal RAM for this software image in bytes.",
-          "type": "integer"
-        },
-        "size": {
-          "title": "Size",
-          "description": "Size of this software image in bytes.",
-          "type": "integer"
-        },
-        "userMetadata": {
-          "title": "Usermetadata",
-          "description": "User-defined data.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "KeyValue Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "imagePath": {
-          "title": "Imagepath",
-          "description": "Path in the VNF package.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    },
-    "VnfPackageArtifactInfo": {
-      "description": "Information about VNF package artifacts contained in the VNF package that are not software images.",
-      "required": ["artifactPath", "checksum"],
-      "type": "object",
-      "properties": {
-        "artifactPath": {
-          "title": "Artifactpath",
-          "description": "Path in the VNF package.",
-          "type": "string",
-          "minLength": 1
-        },
-        "checksum": {
-          "$ref": "#/definitions/Checksum"
-        },
-        "metadata": {
-          "title": "Metadata",
-          "description": "The metadata of the artifact that are available in the VNF package",
-          "type": "object",
-          "additionalProperties": {
-            "description": "KeyValue Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "VNF_PKGM_Link_Serializer": {
-      "title": " links",
-      "description": "Links to resources related to this resource.",
-      "required": ["self", "packageContent"],
-      "type": "object",
-      "properties": {
-        "self": {
-          "$ref": "#/definitions/UriLink"
-        },
-        "vnfd": {
-          "$ref": "#/definitions/UriLink"
-        },
-        "packageContent": {
-          "$ref": "#/definitions/UriLink"
-        }
-      }
-    },
-    "VnfPkgInfo": {
-      "required": ["id", "onboardingState", "operationalState", "usageState", "_links"],
-      "type": "object",
-      "properties": {
-        "id": {
-          "title": "Id",
-          "description": "Identifier of the on-boarded VNF package.",
-          "type": "string",
-          "minLength": 1
-        },
-        "vnfdId": {
-          "title": "Vnfdid",
-          "description": "This identifier, which is managed by the VNF provider, identifies the VNF package and the VNFD in a globally unique way.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfProvider": {
-          "title": "Vnfprovider",
-          "description": "Provider of the VNF package and the VNFD.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfProductName": {
-          "title": "Vnfproductname",
-          "description": "Name to identify the VNF product.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfSoftwareVersion": {
-          "title": "Vnfsoftwareversion",
-          "description": "Software version of the VNF.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "vnfdVersion": {
-          "title": "Vnfdversion",
-          "description": "The version of the VNvFD.",
-          "type": "string",
-          "x-nullable": true
-        },
-        "checksum": {
-          "$ref": "#/definitions/Checksum"
-        },
-        "softwareImages": {
-          "description": "Information about VNF package artifacts that are software images.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/VnfPackageSoftwareImageInfo"
-          },
-          "x-nullable": true
-        },
-        "additionalArtifacts": {
-          "description": "Information about VNF package artifacts contained in the VNF package that are not software images.",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/VnfPackageArtifactInfo"
-          },
-          "x-nullable": true
-        },
-        "onboardingState": {
-          "title": "Onboardingstate",
-          "description": "On-boarding state of the VNF package.",
-          "type": "string",
-          "enum": ["CREATED", "UPLOADING", "PROCESSING", "ONBOARDED"]
-        },
-        "operationalState": {
-          "title": "Operationalstate",
-          "description": "Operational state of the VNF package.",
-          "type": "string",
-          "enum": ["ENABLED", "DISABLED"]
-        },
-        "usageState": {
-          "title": "Usagestate",
-          "description": "Usage state of the VNF package.",
-          "type": "string",
-          "enum": ["IN_USE", "NOT_IN_USE"]
-        },
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User defined data for the VNF package.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "KeyValue Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        },
-        "_links": {
-          "$ref": "#/definitions/VNF_PKGM_Link_Serializer"
-        }
-      }
-    },
-    "CreateVnfPkgInfoRequest": {
-      "type": "object",
-      "properties": {
-        "userDefinedData": {
-          "title": "Userdefineddata",
-          "description": "User defined data for the VNF package.",
-          "type": "object",
-          "additionalProperties": {
-            "description": "KeyValue Pairs",
-            "type": "string"
-          },
-          "x-nullable": true
-        }
-      }
-    },
-    "UploadVnfPackageFromUriRequest": {
-      "required": ["addressInformation"],
-      "type": "object",
-      "properties": {
-        "addressInformation": {
-          "title": "Addressinformation",
-          "description": "Address information of the VNF package content.",
-          "type": "string",
-          "minLength": 1
-        },
-        "userName": {
-          "title": "Username",
-          "description": "User name to be used for authentication.",
-          "type": "string",
-          "minLength": 1
-        },
-        "password": {
-          "title": "Password",
-          "description": "Password to be used for authentication.",
-          "type": "string",
-          "minLength": 1
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/SOL003-VNFPackageManagement-Notification-API.json b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/SOL003-VNFPackageManagement-Notification-API.json
deleted file mode 100644
index 32e002f0e7..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/etsi-sol003-pkgm-ext-clients/src/main/resources/SOL003-VNFPackageManagement-Notification-API.json
+++ /dev/null
@@ -1,1778 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1",
-    "title": "SOL003 - VNF Package Management Notification interface",
-    "description": "SOL003 - VNF Package Management Notification interface\n\nIMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.\n\nIn clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based filtering mechanism is defined. This mechanism is currently not included in the corresponding OpenAPI design for this GS version. Changes to the attribute-based filtering mechanism are being considered in v2.5.1 of this GS for inclusion in the corresponding future ETSI NFV OpenAPI design.\nPlease report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=\n",
-    "license": {
-      "name": "ETSI Forge copyright notice",
-      "url": "https://forge.etsi.org/etsi-forge-copyright-notice.txt"
-    }
-  },
-  "externalDocs": {
-    "description": "ETSI GS NFV-SOL 003 V2.5.1",
-    "url": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/003/02.05.01_60/gs_nfv-sol003v020501p.pdf"
-  },
-  "basePath": "/callback/v1",
-  "schemes": ["https"],
-  "consumes": ["application/json"],
-  "produces": ["application/json"],
-  "paths": {
-    "/URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageOnboardingNotification": {
-      "post": {
-        "description": "Notify\n\nThe POST method delivers a notification from the server to the client.\n",
-        "parameters": [{
-          "name": "VnfPackageOnboardingNotification",
-          "description": "A notification about on-boarding of a VNF package.",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "description": "This type represents a VNF package management notification, which informs the receiver that the onboarding process of a VNF package is complete and the package is ready for use. The notification shall be triggered by the NFVO when the \"onboardingState\" attribute of a new VNF package has changed to \"ONBOARDED\".\n",
-            "type": "object",
-            "required": ["id", "notificationType", "subscriptionId", "timeStamp", "vnfPkgId", "vnfdId", "_links"],
-            "properties": {
-              "id": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "notificationType": {
-                "description": "Discriminator for the different notification types. Shall be set to \"VnfPackageOnboardingNotification\" for this notification type.\n",
-                "type": "string",
-                "enum": ["VnfPackageOnboardingNotification"]
-              },
-              "subscriptionId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "timeStamp": {
-                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-                "type": "string",
-                "format": "date-time"
-              },
-              "vnfPkgId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "vnfdId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "_links": {
-                "description": "This type represents the links to resources that a VNF package management notification can contain.\n",
-                "type": "object",
-                "required": ["vnfPackage", "subscription"],
-                "properties": {
-                  "vnfPackage": {
-                    "description": "This type represents a link to a resource in a notification, using an absolute or relative URI. It shall comply with the provisions defined in table 4.4.1.3a-1.\n",
-                    "type": "object",
-                    "required": ["href"],
-                    "properties": {
-                      "href": {
-                        "description": "String formatted according to IETF RFC 3986.\n",
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "subscription": {
-                    "description": "This type represents a link to a resource in a notification, using an absolute or relative URI. It shall comply with the provisions defined in table 4.4.1.3a-1.\n",
-                    "type": "object",
-                    "required": ["href"],
-                    "properties": {
-                      "href": {
-                        "description": "String formatted according to IETF RFC 3986.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }, {
-          "name": "Authorization",
-          "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "in": "header",
-          "required": false,
-          "type": "string"
-        }, {
-          "name": "Content-Type",
-          "description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }, {
-          "name": "Version",
-          "description": "Version of the API requested to use when responding to this request.\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }],
-        "responses": {
-          "204": {
-            "description": "204 NO CONTENT\nThe notification was delivered successfully.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      },
-      "get": {
-        "description": "The GET method allows the server to test the notification endpoint that is provided by the client, e.g. during subscription.\n",
-        "parameters": [{
-          "name": "Authorization",
-          "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "in": "header",
-          "required": false,
-          "type": "string"
-        }, {
-          "name": "Version",
-          "description": "Version of the API requested to use when responding to this request.\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }],
-        "responses": {
-          "204": {
-            "description": "204 NO CONTENT\nThe notification endpoint was tested successfully. The response body shall be empty.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/URI-is-provided-by-the-client-when-creating-the-subscription-VnfPackageChangeNotification": {
-      "post": {
-        "description": "Notify\n\nThe POST method delivers a notification from the server to the client.\n",
-        "parameters": [{
-          "name": "VnfPackageChangeNotification",
-          "description": "A notification about changes of status in a VNF package.\n",
-          "in": "body",
-          "required": true,
-          "schema": {
-            "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion NF package will be reported. Changes in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows: * The \"operationalState\" attribute of a VNF package has changed, and the  \"onboardingState\" attribute of the package has the value \"ONBOARDED\"\n  (i.e. the package has been onboarded previously).\n* The on-boarded VNF package has been deleted.\n",
-            "type": "object",
-            "required": ["id", "notificationType", "subscriptionId", "timeStamp", "vnfPkgId", "vnfdId", "changeType", "_links"],
-            "properties": {
-              "id": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "notificationType": {
-                "description": "Discriminator for the different notification types.  Shall be set to \"VnfPackageChangeNotification\" for this notification type.\n",
-                "type": "string",
-                "enum": ["VnfPackageChangeNotification"]
-              },
-              "subscriptionId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "timeStamp": {
-                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
-                "type": "string",
-                "format": "date-time"
-              },
-              "vnfPkgId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "vnfdId": {
-                "description": "An identifier with the intention of being globally unique.\n",
-                "type": "string"
-              },
-              "changeType": {
-                "description": "- OP_STATE_CHANGE: The \"operationalState\" attribute has been changed. - PKG_DELETE: The VNF package has been deleted.\n",
-                "type": "string",
-                "enum": ["OP_STATE_CHANGE", "PKG_DELETE"]
-              },
-              "operationalState": {
-                "description": "- ENABLED: The VNF package is enabled, i.e. it can be used for  instantiation of new VNF instances.\n- DISABLED: The VNF package is disabled, i.e. it cannot be used for  further VNF instantiation requests (unless and until the VNF package\n  is re-enabled).\n",
-                "type": "string",
-                "enum": ["ENABLED", "DISABLED"]
-              },
-              "_links": {
-                "description": "This type represents the links to resources that a VNF package management notification can contain.\n",
-                "type": "object",
-                "required": ["vnfPackage", "subscription"],
-                "properties": {
-                  "vnfPackage": {
-                    "description": "This type represents a link to a resource in a notification, using an absolute or relative URI. It shall comply with the provisions defined in table 4.4.1.3a-1.\n",
-                    "type": "object",
-                    "required": ["href"],
-                    "properties": {
-                      "href": {
-                        "description": "String formatted according to IETF RFC 3986.\n",
-                        "type": "string"
-                      }
-                    }
-                  },
-                  "subscription": {
-                    "description": "This type represents a link to a resource in a notification, using an absolute or relative URI. It shall comply with the provisions defined in table 4.4.1.3a-1.\n",
-                    "type": "object",
-                    "required": ["href"],
-                    "properties": {
-                      "href": {
-                        "description": "String formatted according to IETF RFC 3986.\n",
-                        "type": "string"
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }, {
-          "name": "Authorization",
-          "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "in": "header",
-          "required": false,
-          "type": "string"
-        }, {
-          "name": "Content-Type",
-          "description": "The MIME type of the body of the request. Reference: IETF RFC 7231\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }, {
-          "name": "Version",
-          "description": "Version of the API requested to use when responding to this request.\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }],
-        "responses": {
-          "204": {
-            "description": "204 NO CONTENT\nThe notification was delivered successfully.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      },
-      "get": {
-        "description": "The GET method allows the server to test the notification endpoint that is provided by the client, e.g. during subscription.\n",
-        "parameters": [{
-          "name": "Authorization",
-          "description": "The authorization token for the request. Reference: IETF RFC 7235\n",
-          "in": "header",
-          "required": false,
-          "type": "string"
-        }, {
-          "name": "Version",
-          "description": "Version of the API requested to use when responding to this request.\n",
-          "in": "header",
-          "required": true,
-          "type": "string"
-        }],
-        "responses": {
-          "204": {
-            "description": "204 NO CONTENT\nThe notification endpoint was tested successfully. The response body shall be empty.\n",
-            "headers": {
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            }
-          },
-          "400": {
-            "description": "400 BAD REQUEST\n400 code can be returned in the following specified cases, the specific cause has to be proper specified in the \"ProblemDetails\" structure to be returned.\nIf the request is malformed or syntactically incorrect (e.g. if the request URI contains incorrect query parameters or the payload body contains a syntactically incorrect data structure), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf the response to a GET request which queries a container resource would be so big that the performance of the API producer is adversely affected, and the API producer does not support paging for the affected resource, it shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and should include in the \"detail\" attribute more information about the source of the problem.\nIf there is an application error related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\nIf the request contains a malformed access token, the API producer should respond with this response. The details of the error shall be returned in the WWW Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\nThe use of this HTTP error response code described above is applicable to the use of the OAuth 2.0 for the authorization of API requests and notifications, as defined in clauses 4.5.3.3 and 4.5.3.4.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "401 UNAUTHORIZED\nIf the request contains no access token even though one is required, or if the request contains an authorization token that is invalid (e.g. expired or revoked), the API producer should respond with this response. The details of the error shall be returned in the WWW-Authenticate HTTP header, as defined in IETF RFC 6750 and IETF RFC 7235. The ProblemDetails structure may be provided.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "403": {
-            "description": "403 FORBIDDEN\nIf the API consumer is not allowed to perform a particular request to a particular resource, the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided. It should include in the \"detail\" attribute information about the source of the problem, and may indicate how to solve it.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "404": {
-            "description": "404 NOT FOUND\nIf the API producer did not find a current representation for the resource addressed by the URI passed in the request or is not willing to disclose that one exists, it shall respond with this response code. The \"ProblemDetails\" structure may be provided, including in the \"detail\" attribute information about the source of the problem, e.g. a wrong resource URI variable.\nThis response code is not appropriate in case the resource addressed by the URI is a container resource which is designed to contain child resources, but does not contain any child resource at the time the request is received. For a GET request to an existing empty container resource, a typical response contains a 200 OK response code and a payload body with an empty array.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "406": {
-            "description": "406 NOT ACCEPTABLE\nIf the \"Accept\" header does not contain at least one name of a content type that is acceptable to the API producer, the API producer shall respond with this response code. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "500": {
-            "description": "500 INTERNAL SERVER ERROR\nIf there is an application error not related to the client's input that cannot be easily mapped to any other HTTP response code (\"catch all error\"), the API producer shall respond with this response code. The \"ProblemDetails\" structure shall be provided, and shall include in the \"detail\" attribute more information about the source of the problem.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          },
-          "503": {
-            "description": "503 SERVICE UNAVAILABLE\nIf the API producer encounters an internal overload situation of itself or of a system it relies on, it should respond with this response code, following the provisions in IETF RFC 7231 for the use of the \"Retry-After\" HTTP header and for the alternative to refuse the connection. The \"ProblemDetails\" structure may be omitted.\n",
-            "headers": {
-              "Content-Type": {
-                "description": "The MIME type of the body of the response.",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              },
-              "WWW-Authenticate": {
-                "description": "Challenge if the corresponding HTTP request has not provided authorization, or error details if the corresponding HTTP request has provided an invalid authorization token.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 0
-              },
-              "Version": {
-                "description": "Version of the API used in the response.\n",
-                "type": "string",
-                "maximum": 1,
-                "minimum": 1
-              }
-            },
-            "schema": {
-              "description": "The definition of the general \"ProblemDetails\" data structure from IETF RFC 7807 [19] is reproduced inthis structure. Compared to the general framework defined in IETF RFC 7807 [19], the \"status\" and \"detail\" attributes are mandated to be included by the present document, to ensure that the response contains additional textual information about an error. IETF RFC 7807 [19] foresees extensibility of the \"ProblemDetails\" type. It is possible that particular APIs in the present document, or particular implementations, define extensions to define additional attributes that provide more information about the error. The description column only provides some explanation of the meaning to Facilitate understanding of the design. For a full description, see IETF RFC 7807 [19].\n",
-              "type": "object",
-              "required": ["status", "detail"],
-              "properties": {
-                "type": {
-                  "description": "A URI reference according to IETF RFC 3986 [5] that identifies the problem type. It is encouraged that the URI provides human-readable documentation for the problem (e.g. using HTML) when dereferenced. When this member is not present, its value is assumed to be \"about:blank\".\n",
-                  "type": "string",
-                  "format": "URI"
-                },
-                "title": {
-                  "description": "A short, human-readable summary of the problem type. It should not change from occurrence to occurrence of the problem, except for purposes of localization. If type is given and other than \"about:blank\", this attribute shall also be provided. A short, human-readable summary of the problem type.  It SHOULD NOT change from occurrence to occurrence of the problem, except for purposes of localization (e.g., using proactive content negotiation; see [RFC7231], Section 3.4).\n",
-                  "type": "string"
-                },
-                "status": {
-                  "description": "The HTTP status code for this occurrence of the problem. The HTTP status code ([RFC7231], Section 6) generated by the origin server for this occurrence of the problem.\n",
-                  "type": "integer"
-                },
-                "detail": {
-                  "description": "A human-readable explanation specific to this occurrence of the problem.\n",
-                  "type": "string"
-                },
-                "instance": {
-                  "description": "A URI reference that identifies the specific occurrence of the problem. It may yield further information if dereferenced.\n",
-                  "type": "string",
-                  "format": "URI"
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/pom.xml
deleted file mode 100644
index 50dae78aa8..0000000000
--- a/adapters/etsi-sol003-adapter/etsi-sol003-pkgm/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so.adapters</groupId>
-    <artifactId>etsi-sol003-adapter</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>etsi-sol003-pkgm</artifactId>
-  <name>ETSI SOL003 VNF Package Management</name>
-  <packaging>pom</packaging>
-  <modules>
-    <module>etsi-sol003-pkgm-api</module>
-    <module>etsi-sol003-pkgm-ext-clients</module>
-    <module>etsi-sol003-pkgm-adapter</module>
-  </modules>
-</project>
-\ No newline at end of file
diff --git a/adapters/etsi-sol003-adapter/pom.xml b/adapters/etsi-sol003-adapter/pom.xml
deleted file mode 100644
index 6d98622e55..0000000000
--- a/adapters/etsi-sol003-adapter/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.so</groupId>
-    <artifactId>adapters</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.onap.so.adapters</groupId>
-  <artifactId>etsi-sol003-adapter</artifactId>
-  <name>ETSI SOL003 Adapter</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <version-swagger-codegen>2.3.1</version-swagger-codegen>
-    <gson-fire-version>1.8.2</gson-fire-version>
-    <retrofit-version>2.7.2</retrofit-version>
-    <threetenbp-version>1.3.5</threetenbp-version>
-    <oltu-version>1.0.1</oltu-version>
-    <swagger-core-version>1.6.2</swagger-core-version>
-    <okhttp3-version>3.14.0</okhttp3-version>
-    <okhttp-version>2.7.5</okhttp-version>
-    <okio-version>1.13.0</okio-version>
-    <spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version>
-  </properties>
-
-  <modules>
-    <module>etsi-sol003-adapter-common</module>
-    <module>etsi-sol003-pkgm</module>
-    <module>etsi-sol003-lcm</module>
-    <module>etsi-sol003-adapter-application</module>
-  </modules>
-</project>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index d3ff6b0954..ee480215f3 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -20,7 +20,6 @@
     <module>mso-requests-db-adapter</module>
     <module>mso-catalog-db-adapter</module>
     <module>mso-openstack-adapters</module>
-    <module>etsi-sol003-adapter</module>
     <module>so-appc-orchestrator</module>
   </modules>
author	waqas.ikram <waqas.ikram@est.tech>	2021-02-19 09:18:44 +0000
committer	waqas.ikram <waqas.ikram@est.tech>	2021-02-19 11:38:51 +0000
commit	f8e38b54b043d358114a6752a19b95183522abe9 (patch)
tree	a103179fc41e261cb57d20637eb8748bc068b2d9 /adapters
parent	92f39dea69eac0ddb4e61cf716bdf248d1fa5e44 (diff)