Correcting iaas property names

The skiphypervisorcheck property was misspelled.

Change-Id: I7aa4d01ed079d33e23b7c8be36bb6e7f24aa4bd6
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: APPC-268

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
index 9a02494..23676a0 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/common/constants/Property.java
@@ -32,9 +32,10 @@ public class Property {
     public static final String PROVIDER = "provider";
     public static final String PROVIDER_IDENTITY = "identity";
     public static final String PROVIDER_TENANT = "tenant";
-    public static final String PROVIDER_TENANT_DOMAIN = "Default";
+    public static final String PROVIDER_TENANT_DOMAIN = "domain";
     public static final String PROVIDER_TENANT_NAME = "name";
     public static final String PROVIDER_TENANT_PASSWORD = "password";
     public static final String PROVIDER_TENANT_USERID = "userid";
     public static final String PROVIDER_TYPE = "type";
+    public static final String SKIP_HYPERVISOR_CHECK = "org.openecomp.appc.iaas.skiphypervisorcheck";
 }

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
index 2477c9a..919562c 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/MigrateServer.java
@@ -41,6 +41,7 @@ import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
 import org.openecomp.appc.adapter.iaas.impl.RequestContext;
 import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
 import org.openecomp.appc.adapter.iaas.impl.VMURL;
+import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
 import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
 import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
 import org.openecomp.appc.configuration.Configuration;
@@ -102,7 +103,7 @@ public class MigrateServer extends ProviderServerOperation {
         setTimeForMetricsLogger();
 
         // Is the skip Hypervisor check attribute populated?
-        String skipHypervisorCheck = configuration.getProperty("org.openecomp.appc.iaas.skiphypervisorchek");
+        String skipHypervisorCheck = configuration.getProperty(Property.SKIP_HYPERVISOR_CHECK);
         if (skipHypervisorCheck == null && svcCtx != null) {
             skipHypervisorCheck = svcCtx.getAttribute(ProviderAdapter.SKIP_HYPERVISOR_CHECK);
         }

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
index ad7d15b..9a185ff 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RebuildServer.java
@@ -45,6 +45,7 @@ import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
 import org.openecomp.appc.adapter.iaas.impl.RequestContext;
 import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
 import org.openecomp.appc.adapter.iaas.impl.VMURL;
+import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
 import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Operation;
 import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
 import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
@@ -189,7 +190,7 @@ public class RebuildServer extends ProviderServerOperation {
         }
 
         // Is the skip Hypervisor check attribute populated?
-        String skipHypervisorCheck = configuration.getProperty("org.openecomp.appc.iaas.skiphypervisorchek");
+        String skipHypervisorCheck = configuration.getProperty(Property.SKIP_HYPERVISOR_CHECK);
         if (skipHypervisorCheck == null && ctx != null) {
             skipHypervisorCheck = ctx.getAttribute(ProviderAdapter.SKIP_HYPERVISOR_CHECK);
         }

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
index 5adb7f3..7d191a3 100644 (file)
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/openecomp/appc/adapter/iaas/provider/operation/impl/RestartServer.java
@@ -39,6 +39,7 @@ import org.openecomp.appc.adapter.iaas.impl.IdentityURL;
 import org.openecomp.appc.adapter.iaas.impl.RequestContext;
 import org.openecomp.appc.adapter.iaas.impl.RequestFailedException;
 import org.openecomp.appc.adapter.iaas.impl.VMURL;
+import org.openecomp.appc.adapter.iaas.provider.operation.common.constants.Property;
 import org.openecomp.appc.adapter.iaas.provider.operation.common.enums.Outcome;
 import org.openecomp.appc.adapter.iaas.provider.operation.impl.base.ProviderServerOperation;
 import org.openecomp.appc.exceptions.UnknownProviderException;
@@ -84,7 +85,7 @@ public class RestartServer extends ProviderServerOperation {
 
         setTimeForMetricsLogger("restart server");
 
-        String skipHypervisorCheck = configuration.getProperty("org.openecomp.appc.iaas.skiphypervisorchek");
+        String skipHypervisorCheck = configuration.getProperty(Property.SKIP_HYPERVISOR_CHECK);
         if (skipHypervisorCheck == null && ctx != null) {
             skipHypervisorCheck = ctx.getAttribute(ProviderAdapter.SKIP_HYPERVISOR_CHECK);
         }