You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/11/21 00:07:53 UTC
git commit: updated refs/heads/master to 2d42b2d
Updated Branches:
refs/heads/master 86736d6d4 -> 2d42b2d1a
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/2d42b2d1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d42b2d1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d42b2d1
Branch: refs/heads/master
Commit: 2d42b2d1ab19f5b4ce839607b5919a58e6755c76
Parents: 86736d6
Author: Edison Su <su...@gmail.com>
Authored: Wed Nov 20 15:04:31 2013 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Wed Nov 20 15:07:02 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/2d42b2d1/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 0000bef..f625eee 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
@@ -2048,6 +2048,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);
@@ -2089,17 +2092,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/2d42b2d1/setup/db/db/schema-421to430.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql
index 15f8591..7dc475f 100644
--- a/setup/db/db/schema-421to430.sql
+++ b/setup/db/db/schema-421to430.sql
@@ -752,4 +752,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);