Merge "Update ETSI Catalog Swagger file. Change filters to filter for PkgmSubscriptionRequest object"

3 files changed, 6 insertions, 6 deletions

diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/src/main/resources/ETSI-Catalog-API.json b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/src/main/resources/ETSI-Catalog-API.json
index 3c5ec49b80..35a8c2bd3d 100644
--- a/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/src/main/resources/ETSI-Catalog-API.json
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-adapter-ext-clients/src/main/resources/ETSI-Catalog-API.json
@@ -5,7 +5,7 @@
     "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",
+  "host": "127.0.0.1:8806",
   "schemes": ["http"],
   "basePath": "/",
   "consumes": ["application/json"],
@@ -2641,7 +2641,7 @@
         "inputs": {
           "title": "Inputs",
           "description": "Inputs",
-          "type": "string"
+          "type": "object"
         }
       }
     },
@@ -2652,7 +2652,7 @@
         "model": {
           "title": "Model",
           "description": "Model",
-          "type": "string"
+          "type": "object"
         }
       }
     },
@@ -2825,7 +2825,7 @@
       "required": ["callbackUri"],
       "type": "object",
       "properties": {
-        "filters": {
+        "filter": {
           "$ref": "#/definitions/PkgmNotificationsFilter"
         },
         "callbackUri": {
diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java
index f32a9b0fa9..caefe71993 100644
--- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/converters/sol003/etsicatalog/PkgmSubscriptionRequestConverter.java
@@ -55,7 +55,7 @@ public class PkgmSubscriptionRequestConverter implements
                 new org.onap.so.adapters.vnfmadapter.extclients.etsicatalog.model.PkgmSubscriptionRequest();
 
         etsiCatalogManagerSubscriptionRequest
-                .setFilters(getPkgmNotificationsFilter(pkgmSubscriptionRequest.getFilter()));
+                .setFilter(getPkgmNotificationsFilter(pkgmSubscriptionRequest.getFilter()));
 
         return etsiCatalogManagerSubscriptionRequest;
     }
diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementSubscriptionControllerTest.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementSubscriptionControllerTest.java
index 9016cad528..a2828b1f9f 100644
--- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementSubscriptionControllerTest.java
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/test/java/org/onap/so/adapters/vnfmadapter/rest/Sol003PackageManagementSubscriptionControllerTest.java
@@ -324,7 +324,7 @@ public class Sol003PackageManagementSubscriptionControllerTest {
 
     private org.onap.so.adapters.vnfmadapter.extclients.etsicatalog.model.PkgmSubscriptionRequest getEtsiCatalogPkgmSubscriptionRequest() {
         return new org.onap.so.adapters.vnfmadapter.extclients.etsicatalog.model.PkgmSubscriptionRequest()
-                .filters(new PkgmNotificationsFilter()
+                .filter(new PkgmNotificationsFilter()
                         .addNotificationTypesItem(
                                 PkgmNotificationsFilter.NotificationTypesEnum.VNFPACKAGEONBOARDINGNOTIFICATION)
                         .addVnfdIdItem("VNFDID").addVnfPkgIdItem("VNFPKGID")