From 2d42b2d1ab19f5b4ce839607b5919a58e6755c76 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Wed, 20 Nov 2013 15:04:31 -0800 Subject: [PATCH] Add logs in case ipassoccmd failed --- .../kvm/resource/LibvirtComputingResource.java | 10 ++++++---- setup/db/db/schema-421to430.sql | 1 + 2 files changed, 7 insertions(+), 4 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 0000bef3411..f625eeed81b 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); } } diff --git a/setup/db/db/schema-421to430.sql b/setup/db/db/schema-421to430.sql index 15f85913f70..7dc475fa8d3 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);