From 9fe611037f1cfec7c7819e4eac0f8535ee7fed60 Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@widodh.nl>
Date: Wed, 8 Aug 2012 20:48:43 +0200
Subject: [PATCH] agent: Set default values for all variables

---
 .../resource/LibvirtComputingResource.java    | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index dea00bd5ce3..ab8a34d5ef7 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -412,6 +412,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements
         return "scripts/storage/qcow2";
     }
 
+    protected String getDefaultKvmScriptsDir() {
+        return "scripts/vm/hypervisor/kvm";
+    }
+
+    protected String getDefaultDomrScriptsDir() {
+        return "scripts/network/domr/kvm";
+    }
+
     @Override
     public boolean configure(String name, Map<String, Object> params)
             throws ConfigurationException {
@@ -430,16 +438,15 @@ public class LibvirtComputingResource extends ServerResourceBase implements
                     + "com.cloud.storage.JavaStorageLayer");
         }
 
-        _virtRouterResource = new VirtualRoutingResource();
 
-        // Set the domr scripts directory
-        params.put("domr.scripts.dir", "scripts/network/domr/kvm");
-
-        success = _virtRouterResource.configure(name, params);
+        String domrScriptsDir = (String) params.get("domr.scripts.dir");
+        if (domrScriptsDir == null) {
+            domrScriptsDir = getDefaultDomrScriptsDir();
+        }
 
         String kvmScriptsDir = (String) params.get("kvm.scripts.dir");
         if (kvmScriptsDir == null) {
-            kvmScriptsDir = "scripts/vm/hypervisor/kvm";
+            kvmScriptsDir = getDefaultKvmScriptsDir();
         }
 
         String networkScriptsDir = (String) params.get("network.scripts.dir");
@@ -452,6 +459,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements
             storageScriptsDir = getDefaultStorageScriptsDir();
         }
 
+        params.put("domr.scripts.dir", domrScriptsDir);
+
+        _virtRouterResource = new VirtualRoutingResource();
+        success = _virtRouterResource.configure(name, params);
+
         if (!success) {
             return false;
         }