fix attach volume for kvm

sudison · sudison · commit 4e4112fcecc4 · 2013-05-23T13:51:46.000-07:00
diff --git a/developer/pom.xml b/developer/pom.xml
@@ -156,6 +156,7 @@
                 <argument>${basedir}/target/db/cloudbridge_offering_alter.sql</argument>
                 <!-- Seed the database -->
                 <argument>${basedir}/developer-prefill.sql</argument>
+                <argument>${basedir}/developer-prefill.sql.override</argument>
                 <!-- Do database upgrade-->
                 <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
                 <argument>--database=cloud,usage,awsapi</argument>
@@ -232,4 +233,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java
@@ -147,6 +147,13 @@ public static void main(String[] args) {
                 databases = arg.substring(arg.lastIndexOf("=") + 1, arg.length()).split(",");
             } else if (arg.endsWith(".sql")) {
                 sqlFiles.add(arg);
+            } else if (arg.endsWith(".sql.override")) {
+            	if (fileExists(arg)) {
+            		int index = arg.lastIndexOf(".override");
+            		String fileToOverride = arg.substring(0, index);
+            		sqlFiles.remove(fileToOverride);
+            		sqlFiles.add(arg);
+            	}
             } else if (arg.endsWith(".properties")) {
                 if (!dbPropsFile.endsWith("properties.override") && fileExists(arg))
                     dbPropsFile = arg;
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -680,7 +680,7 @@ public Answer attachVolume(AttachCommand cmd) {
     	DiskTO disk = cmd.getDisk();
         VolumeObjectTO vol = (VolumeObjectTO)disk.getData();
         PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore();
-        String vmName = vol.getVmName();
+        String vmName = cmd.getVmName();
         try {
             Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
             KVMStoragePool primary = storagePoolMgr.getStoragePool(
@@ -714,7 +714,7 @@ public Answer dettachVolume(DettachCommand cmd) {
     	DiskTO disk = cmd.getDisk();
         VolumeObjectTO vol = (VolumeObjectTO)disk.getData();
         PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore();
-        String vmName = vol.getVmName();
+        String vmName = cmd.getVmName();
         try {
             Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
             KVMStoragePool primary = storagePoolMgr.getStoragePool(
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -224,9 +224,20 @@ public void persistDefaultValues() throws InternalErrorException {
             }
 
             String hostIpAdr = NetUtils.getDefaultHostIp();
+            boolean needUpdateHostIp = true;
             if (hostIpAdr != null) {
-                _configDao.update(Config.ManagementHostIPAdr.key(), Config.ManagementHostIPAdr.getCategory(), hostIpAdr);
-                s_logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host.");
+            	Boolean devel = Boolean.valueOf(_configDao.getValue("developer"));
+            	if (devel) {
+            		String value = _configDao.getValue(Config.ManagementHostIPAdr.key());
+            		if (value != null) {
+            			needUpdateHostIp = false;
+            		}
+            	}
+               
+            	if (needUpdateHostIp) {
+            		 _configDao.update(Config.ManagementHostIPAdr.key(), Config.ManagementHostIPAdr.getCategory(), hostIpAdr);
+                     s_logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host.");
+            	}
             }
 
             // generate a single sign-on key
