refactor

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

debian/cloudstack-common.install

@@ -27,7 +27,7 @@
 /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
 /usr/share/cloudstack-common/scripts/vm/hypervisor/vmware/*
 /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
-/usr/share/cloudstack-common/scripts/vm/hypervisor/external/simpleExternalProvisioner/*
+/usr/share/cloudstack-common/scripts/vm/hypervisor/external/provisioner/*
 /usr/share/cloudstack-common/lib/*
 /usr/share/cloudstack-common/vms/*
 /usr/bin/cloudstack-set-guest-password

…ovisioner/SimpleExternalProvisioner.java …xternalEntryPointPayloadProvisioner.javaplugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/simpleprovisioner/SimpleExternalProvisioner.java renamed to plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalEntryPointPayloadProvisioner.java plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/simpleprovisioner/SimpleExternalProvisioner.java renamed to plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/provisioner/ExternalEntryPointPayloadProvisioner.java

@@ -16,7 +16,7 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-package org.apache.cloudstack.hypervisor.external.provisioner.simpleprovisioner;
+package org.apache.cloudstack.hypervisor.external.provisioner;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -85,9 +85,9 @@
 import com.cloud.vm.dao.UserVmDao;
 import com.cloud.vm.dao.VMInstanceDao;
 
-public class SimpleExternalProvisioner extends ManagerBase implements ExternalProvisioner, PluggableService {
+public class ExternalEntryPointPayloadProvisioner extends ManagerBase implements ExternalProvisioner, PluggableService {
 
-    public static final String BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR = "scripts/vm/hypervisor/external/simpleExternalProvisioner";
+    public static final String BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR = "scripts/vm/hypervisor/external/provisioner";
     public static final String BASE_EXTERNAL_PROVISIONER_SCRIPT = BASE_EXTERNAL_PROVISIONER_SCRIPTS_DIR + "/provisioner.sh";
 
     private static final String PROPERTIES_FILE = "server.properties";

plugins/hypervisors/external/src/main/java/org/apache/cloudstack/hypervisor/external/resource/ExternalResource.java

@@ -23,7 +23,7 @@
 
 import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.framework.extensions.command.ExtensionRoutingUpdateCommand;
-import org.apache.cloudstack.hypervisor.external.provisioner.simpleprovisioner.SimpleExternalProvisioner;
+import org.apache.cloudstack.hypervisor.external.provisioner.ExternalEntryPointPayloadProvisioner;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -345,7 +345,7 @@ public void setRunLevel(int level) {
 
     @Override
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
-        externalProvisioner = ComponentContext.inject(SimpleExternalProvisioner.class);
+        externalProvisioner = ComponentContext.inject(ExternalEntryPointPayloadProvisioner.class);
         externalProvisioner.configure(name, params);
         dcId = (String)params.get("zone");
         pod = (String)params.get("pod");

plugins/hypervisors/external/src/main/resources/META-INF/cloudstack/core/spring-external-core-context.xml

@@ -26,6 +26,6 @@
                       http://www.springframework.org/schema/context
                       http://www.springframework.org/schema/context/spring-context.xsd"
                       >
-    <bean id="ExternalProvisioner" class="org.apache.cloudstack.hypervisor.external.provisioner.simpleprovisioner.SimpleExternalProvisioner"/>
+    <bean id="ExternalProvisioner" class="org.apache.cloudstack.hypervisor.external.provisioner.ExternalEntryPointPayloadProvisioner"/>
     <bean id="ExternalAgentManager" class="org.apache.cloudstack.agent.manager.ExternalAgentManagerImpl" />
 </beans>