cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/4.3 to e03088a
Date Wed, 20 Nov 2013 23:05:31 GMT
Updated Branches:
  refs/heads/4.3 3381d4eae -> e03088a3f


Add logs in case ipassoccmd failed


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e03088a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e03088a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e03088a3

Branch: refs/heads/4.3
Commit: e03088a3f124407349cffb3ffef5a5f4dfd9c9b4
Parents: 3381d4e
Author: Edison Su <sudison@gmail.com>
Authored: Wed Nov 20 15:04:31 2013 -0800
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Nov 20 15:04:31 2013 -0800

----------------------------------------------------------------------
 .../hypervisor/kvm/resource/LibvirtComputingResource.java | 10 ++++++----
 setup/db/db/schema-421to430.sql                           |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e03088a3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
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 eda311f..775b2b8 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
@@ -2025,6 +2025,9 @@ ServerResource {
                 .getAccessDetail(NetworkElementCommand.ROUTER_NAME);
         String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
         String[] results = new String[cmd.getIpAddresses().length];
+        for (int i = 0; i < results.length; i++) {
+            results[i] = IpAssocAnswer.errorResult;
+        }
         Connect conn;
         try {
             conn = LibvirtConnection.getConnectionByVmName(routerName);
@@ -2066,17 +2069,16 @@ ServerResource {
                         ip.isSourceNat(), ip.getBroadcastUri(), ip.getVlanGateway(),
                         ip.getVlanNetmask(), ip.getVifMacAddress(), nicNum, newNic);
 
-                if (result != null) {
-                    results[i++] = IpAssocAnswer.errorResult;
-                } else {
+                if (result == null) {
                     results[i++] = ip.getPublicIp() + " - success";
-                    ;
                 }
             }
             return new IpAssocAnswer(cmd, results);
         } catch (LibvirtException e) {
+            s_logger.error("ipassoccmd failed", e);
             return new IpAssocAnswer(cmd, results);
         } catch (InternalErrorException e) {
+            s_logger.error("ipassoccmd failed", e);
             return new IpAssocAnswer(cmd, results);
         }
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e03088a3/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 40b0c82..8495ccf 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -743,4 +743,5 @@ CREATE VIEW `cloud`.`domain_router_view` AS
             and async_job.instance_type = 'DomainRouter'
             and async_job.job_status = 0;
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'management-server',
"vmware.vcenter.session.timeout", "1200", "VMware client timeout in seconds", "1200", NULL,NULL,0);
+INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Advanced", 'DEFAULT', 'management-server',
"mgt.server.vendor", "ACS", "the vendor of management server", "ACS", NULL,NULL,0);
 


Mime
View raw message