Merge "Flipped status messages based on is operation"

2 files changed, 3 insertions, 5 deletions

diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
index 257374fdb2..4728effdca 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/network/MsoNetworkAdapterImpl.java
@@ -97,7 +97,7 @@ public class MsoNetworkAdapterImpl implements MsoNetworkAdapter {
     private static final String NETWORK_CREATED_STATUS_MESSAGE =
             "The new network was successfully created in the cloud";
     private static final String NETWORK_NOT_EXIST_STATUS_MESSAGE =
-            "The network as not found, thus no network was deleted in the cloud via this request";
+            "The network was not found, thus no network was deleted in the cloud via this request";
     private static final String NETWORK_DELETED_STATUS_MESSAGE = "The network was successfully deleted in the cloud";
 
     private static final Logger logger = LoggerFactory.getLogger(MsoNetworkAdapterImpl.class);
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index 60c5a0ca2a..f495015261 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@ -104,8 +104,6 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
     private static final String DELETE_VNF = "DeleteVNF";
     private static final String QUERY_STACK = "QueryStack";
     private static final String CREATE_VFM_MODULE = "CreateVFModule";
-    private static final String CREATE_VF_STACK = "Create VF: Stack";
-    private static final String STACK = "Stack";
     private static final String USER_ERROR = "USER ERROR";
     private static final String VERSION_MIN = "VersionMin";
     private static final String VERSION_MAX = "VersionMax";
@@ -113,7 +111,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
             "The vf module was found to already exist, thus no new vf module was created in the cloud via this request";
     private static final String VF_CREATED_STATUS_MESSAGE = "The new vf module was successfully created in the cloud";
     private static final String VF_NOT_EXIST_STATUS_MESSAGE =
-            "The vf module was not, thus no vf module was deleted in the cloud via this request";
+            "The vf module was not found, thus no vf module was deleted in the cloud via this request";
     private static final String VF_DELETED_STATUS_MESSAGE = "The vf module was successfully deleted in the cloud";
 
     @Autowired
@@ -1054,7 +1052,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
                             nestedTemplatesChecked, heatFilesObjects, backout.booleanValue(), failIfExists);
                     if (msoRequest.getRequestId() != null) {
                         msoHeatUtils.updateResourceStatus(msoRequest.getRequestId(),
-                                heatStack.isOperationPerformed() ? VF_EXIST_STATUS_MESSAGE : VF_CREATED_STATUS_MESSAGE);
+                                heatStack.isOperationPerformed() ? VF_CREATED_STATUS_MESSAGE : VF_EXIST_STATUS_MESSAGE);
                     }
                 } else {
                     throw new MsoHeatNotFoundException();