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 ECC9910D02 for ; Tue, 3 Dec 2013 12:04:31 +0000 (UTC) Received: (qmail 97312 invoked by uid 500); 3 Dec 2013 12:04:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 97295 invoked by uid 500); 3 Dec 2013 12:04:02 -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 97263 invoked by uid 99); 3 Dec 2013 12:03:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2013 12:03:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 72BD791B6CB; Tue, 3 Dec 2013 12:03:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jayapal@apache.org To: commits@cloudstack.apache.org Message-Id: <4503c08986ca444aafab136e1649d41f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to 8454885 Date: Tue, 3 Dec 2013 12:03:58 +0000 (UTC) Updated Branches: refs/heads/4.3 80a5dd75c -> 8454885fb Corrected parsing vlan tag in JuniperSrx resource With out this chagne ipAssoc command for juniperSrx is failed Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8454885f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8454885f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8454885f Branch: refs/heads/4.3 Commit: 8454885fbe12cd78b225b392b40f330995576d9c Parents: 80a5dd7 Author: Jayapal Authored: Tue Dec 3 17:32:07 2013 +0530 Committer: Jayapal Committed: Tue Dec 3 17:33:06 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/JuniperSrxResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8454885f/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index 684751c..4658759 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -700,7 +700,7 @@ public class JuniperSrxResource implements ServerResource { Long publicVlanTag = null; if (ip.getBroadcastUri() != null && !ip.getBroadcastUri().equals("untagged")) { try { - publicVlanTag = Long.parseLong(ip.getBroadcastUri()); + publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(ip.getBroadcastUri())); } catch (Exception e) { throw new ExecutionException("Could not parse public VLAN tag: " + ip.getBroadcastUri()); }