Merge "Reorder modifiers"

[so.git] / adapters / mso-vnf-adapter / src / main / java / org / openecomp / mso / adapters / vnf / VnfAdapterRest.java

diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VnfAdapterRest.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VnfAdapterRest.java
index 3efab60..d393bea 100644 (file)
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VnfAdapterRest.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/VnfAdapterRest.java
@@ -1,8 +1,9 @@
 /*-
  * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
+ * ONAP - SO
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.
@@ -173,7 +174,7 @@ public class VnfAdapterRest {
                public void run() {
                        try {
                                String cloudsite = req.getCloudSiteId();
-                               Holder<Map<String, String>> outputs = new Holder <Map <String, String>> ();
+                               Holder<Map<String, String>> outputs = new Holder <> ();
                                if (cloudsite != null && !cloudsite.equals(TESTING_KEYWORD)) {
                                        //vnfAdapter.deleteVnf (req.getCloudSiteId(), req.getTenantId(), req.getVfModuleStackId(), req.getMsoRequest());
                                        vnfAdapter.deleteVfModule (req.getCloudSiteId(), req.getTenantId(), req.getVfModuleStackId(), req.getMsoRequest(), outputs);
@@ -225,10 +226,10 @@ public class VnfAdapterRest {
                try {
                        int respStatus = HttpStatus.SC_OK;
                        QueryVfModuleResponse qryResp = new QueryVfModuleResponse(aaiVnfId, aaiVfModuleId, null, null, null);
-                       Holder<Boolean> vnfExists = new Holder<Boolean>();
-                       Holder<String> vfModuleId = new Holder<String>();
-                       Holder<VnfStatus> status  = new Holder<VnfStatus>();
-                       Holder<Map<String, String>> outputs = new Holder <Map <String, String>> ();
+                       Holder<Boolean> vnfExists = new Holder<>();
+                       Holder<String> vfModuleId = new Holder<>();
+                       Holder<VnfStatus> status  = new Holder<>();
+                       Holder<Map<String, String>> outputs = new Holder <> ();
                        vnfAdapter.queryVnf (cloudSiteId, tenantId, vfModuleName, msoRequest, vnfExists, vfModuleId, status, outputs);
                        if (!vnfExists.value) {
                                LOGGER.debug ("vfModule not found");
@@ -353,9 +354,9 @@ public class VnfAdapterRest {
                        LOGGER.debug ("CreateVfModuleTask start");
                        try {
                                // Synchronous Web Service Outputs
-                               Holder <String> vfModuleStackId = new Holder <String> ();
-                               Holder <Map <String, String>> outputs = new Holder <Map <String, String>> ();
-                               Holder <VnfRollback> vnfRollback = new Holder <VnfRollback> ();
+                               Holder <String> vfModuleStackId = new Holder <> ();
+                               Holder <Map <String, String>> outputs = new Holder <> ();
+                               Holder <VnfRollback> vnfRollback = new Holder <> ();
                                String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType();
                                LOGGER.debug("completeVnfVfModuleType=" + completeVnfVfModuleType);
                                String cloudsite = req.getCloudSiteId();
@@ -406,6 +407,7 @@ public class VnfAdapterRest {
                                response = new CreateVfModuleResponse(req.getVnfId(), req.getVfModuleId(),
                                                vfModuleStackId.value, Boolean.TRUE, outputs.value, modRollback, req.getMessageId());
                        } catch (VnfException e) {
+                               LOGGER.debug("Exception :",e);
                                eresp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.TRUE, req.getMessageId());
                        }
                        if (!req.isSynchronous()) {
@@ -481,25 +483,12 @@ public class VnfAdapterRest {
                                //MsoVnfAdapter vnfAdapter = new MsoVnfAdapterImpl (msoPropertiesFactory, cloudConfigFactory);
 
                                // Synchronous Web Service Outputs
-                               Holder <String> vfModuleStackId = new Holder <String> ();
-                               Holder <Map <String, String>> outputs = new Holder <Map <String, String>> ();
-                               Holder <VnfRollback> vnfRollback = new Holder <VnfRollback> ();
+                               Holder <String> vfModuleStackId = new Holder <> ();
+                               Holder <Map <String, String>> outputs = new Holder <> ();
+                               Holder <VnfRollback> vnfRollback = new Holder <> ();
                                String completeVnfVfModuleType = req.getVnfType() + "::" + req.getVfModuleType();
                                LOGGER.debug("in updateVf - completeVnfVfModuleType=" + completeVnfVfModuleType);
 
-                               /*
-                               vnfAdapter.updateVnf (updateReq.getCloudSiteId(),
-                                               updateReq.getTenantId(),
-                                               updateReq.getVnfType(),
-                                               updateReq.getVnfVersion(),
-                                               updateReq.getVfModuleName(),
-                                               updateReq.getRequestType(),
-                                               updateReq.getVolumeGroupStackId(),
-                                               updateReq.getVfModuleParams(),
-                                               updateReq.getMsoRequest(),
-                                               outputs,
-                                               vnfRollback);
-                                               */
                                vnfAdapter.updateVfModule (req.getCloudSiteId(),
                                                req.getTenantId(),
                                                //req.getVnfType(),
@@ -508,7 +497,7 @@ public class VnfAdapterRest {
                                                req.getVfModuleName(),
                                                req.getRequestType(),
                                                req.getVolumeGroupStackId(),
-                                               req.getBaseVfModuleId(),
+                                               req.getBaseVfModuleStackId(),
                                                req.getVfModuleStackId(),
                                                req.getModelCustomizationUuid(),
                                                req.getVfModuleParams(),
@@ -519,6 +508,7 @@ public class VnfAdapterRest {
                                response = new UpdateVfModuleResponse(req.getVnfId(), req.getVfModuleId(),
                                                vfModuleStackId.value, outputs.value, req.getMessageId());
                        } catch (VnfException e) {
+                               LOGGER.debug("Exception :",e);
                                eresp = new VfModuleExceptionResponse(e.getMessage(), MsoExceptionCategory.INTERNAL, Boolean.TRUE, req.getMessageId());
                        }
                        if (!req.isSynchronous()) {
@@ -628,4 +618,4 @@ public class VnfAdapterRest {
                        LOGGER.debug ("RollbackVfModulesTask exit: code=" + getStatusCode() + ", resp="+ getResponse());
                }
        }
-}
+}
\ No newline at end of file