Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C13C910603 for ; Wed, 20 Nov 2013 23:05:31 +0000 (UTC) Received: (qmail 42476 invoked by uid 500); 20 Nov 2013 23:05:31 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 42271 invoked by uid 500); 20 Nov 2013 23:05:31 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 42264 invoked by uid 99); 20 Nov 2013 23:05:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Nov 2013 23:05:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A722885D7D; Wed, 20 Nov 2013 23:05:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: <1c174e10baeb4951b8107bf9b3c885bf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to e03088a Date: Wed, 20 Nov 2013 23:05:31 +0000 (UTC) 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 Authored: Wed Nov 20 15:04:31 2013 -0800 Committer: Edison Su 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);