Fix for SO-2678

[so.git] / adapters / mso-vnfm-adapter / mso-vnfm-etsi-adapter / src / main / java / org / onap / so / adapters / vnfmadapter / extclients / etsicatalog / EtsiCatalogServiceProvider.java

diff --git a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogServiceProvider.java b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogServiceProvider.java
index 0dcc49e..61db82f 100644 (file)
--- a/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogServiceProvider.java
+++ b/adapters/mso-vnfm-adapter/mso-vnfm-etsi-adapter/src/main/java/org/onap/so/adapters/vnfmadapter/extclients/etsicatalog/EtsiCatalogServiceProvider.java
@@ -20,80 +20,13 @@
 
 package org.onap.so.adapters.vnfmadapter.extclients.etsicatalog;
 
-import java.util.Optional;
-import org.onap.so.adapters.vnfmadapter.extclients.etsicatalog.model.NsdmSubscription;
-import org.onap.so.adapters.vnfmadapter.extclients.etsicatalog.model.PkgmSubscription;
-import org.onap.so.adapters.vnfmadapter.extclients.vnfm.packagemanagement.model.InlineResponse2001;
-
 /**
  * Provides methods for invoking REST calls to the ETSI Catalog Manager.
  * 
  * @author gareth.roper@est.tech
  */
-public interface EtsiCatalogServiceProvider {
-
-    /**
-     * 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);
-
-    /**
-     * POST the SubscriptionRequest Object.
-     *
-     * @return The ETSI Catalog Manager's PkgmSubscription object.
-     */
-    Optional<PkgmSubscription> postSubscription(
-            final org.onap.so.adapters.vnfmadapter.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);
+public interface EtsiCatalogServiceProvider
+        extends EtsiCatalogSubscriptionServiceProvider, EtsiCatalogPackageManagementServiceProvider {
 
-    /**
-     * DELETE the SubscriptionRequest Object.
-     *
-     * @return A Boolean representing if the delete was successful or not.
-     */
-    boolean deleteSubscription(final String subscriptionId);
 
 }