Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EAA4BDE5C for ; Thu, 28 Feb 2013 09:25:13 +0000 (UTC) Received: (qmail 90035 invoked by uid 500); 28 Feb 2013 09:25:13 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 89952 invoked by uid 500); 28 Feb 2013 09:25:13 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 89922 invoked by uid 99); 28 Feb 2013 09:25:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2013 09:25:12 +0000 X-ASF-Spam-Status: No, hits=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of Kishan.Kavala@citrix.com designates 203.166.19.134 as permitted sender) Received: from [203.166.19.134] (HELO SMTP.CITRIX.COM.AU) (203.166.19.134) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2013 09:25:05 +0000 X-IronPort-AV: E=Sophos;i="4.84,754,1355097600"; d="scan'208";a="1175692" Received: from banpmailmx01.citrite.net ([10.103.128.73]) by SYDPIPO01.CITRIX.COM.AU with ESMTP/TLS/RC4-MD5; 28 Feb 2013 09:24:43 +0000 Received: from BANPMAILBOX01.citrite.net ([10.103.128.72]) by BANPMAILMX01.citrite.net ([10.103.128.73]) with mapi; Thu, 28 Feb 2013 14:54:40 +0530 From: Kishan Kavala To: "'cloudstack-dev@incubator.apache.org'" CC: "'hugo@apache.org'" Date: Thu, 28 Feb 2013 14:54:40 +0530 Subject: RE: git commit: refs/heads/vpc-pointfix-on-4.0 - SBP-2418: Use a provider list for VPC checks instead of a fixed configuration. This allows more providers to implement VPC services Thread-Topic: git commit: refs/heads/vpc-pointfix-on-4.0 - SBP-2418: Use a provider list for VPC checks instead of a fixed configuration. This allows more providers to implement VPC services Thread-Index: Ac4Vjt/V/iE5MkDTSE6M9GhkLb1XNwABhCUg Message-ID: <33740054EBF5B64BB213E2E0916F2C13F075FBB94D@BANPMAILBOX01.citrite.net> References: <20130228083706.5EB5D10A5A@tyr.zones.apache.org> In-Reply-To: <20130228083706.5EB5D10A5A@tyr.zones.apache.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org Hugo, I added some code to master branch to allow providers other than VPCVirtua= lRouter. Commit : 836ce6c11ad6a11db2c4564620e46bf5e17f8189 This might be similar to what you are trying to do. Btw, what is SBP-2418? ~kishan > -----Original Message----- > From: hugo@apache.org [mailto:hugo@apache.org] > Sent: Thursday, 28 February 2013 2:07 PM > To: cloudstack-commits@incubator.apache.org > Subject: git commit: refs/heads/vpc-pointfix-on-4.0 - SBP-2418: Use a > provider list for VPC checks instead of a fixed configuration. This allow= s more > providers to implement VPC services >=20 > Updated Branches: > refs/heads/vpc-pointfix-on-4.0 [created] 0b9bfc6ec >=20 >=20 > SBP-2418: Use a provider list for VPC checks instead of a fixed configura= tion. > This allows more providers to implement VPC services >=20 > Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo > Commit: http://git-wip-us.apache.org/repos/asf/incubator- > cloudstack/commit/0b9bfc6e > Tree: http://git-wip-us.apache.org/repos/asf/incubator- > cloudstack/tree/0b9bfc6e > Diff: http://git-wip-us.apache.org/repos/asf/incubator- > cloudstack/diff/0b9bfc6e >=20 > Branch: refs/heads/vpc-pointfix-on-4.0 > Commit: 0b9bfc6ece5922c208c6d8fd67867ff475f41db3 > Parents: 4d90876 > Author: Hugo Trippaers > Authored: Thu Feb 28 09:36:55 2013 +0100 > Committer: Hugo Trippaers > Committed: Thu Feb 28 09:36:55 2013 +0100 >=20 > ---------------------------------------------------------------------- > .../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > ---------------------------------------------------------------------- >=20 >=20 > http://git-wip-us.apache.org/repos/asf/incubator- > cloudstack/blob/0b9bfc6e/server/src/com/cloud/network/vpc/VpcManager > Impl.java > ---------------------------------------------------------------------- > diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java > b/server/src/com/cloud/network/vpc/VpcManagerImpl.java > index 675ae59..7a32656 100644 > --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java > +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java > @@ -168,6 +168,7 @@ public class VpcManagerImpl implements > VpcManager, Manager{ > private final ScheduledExecutorService _executor =3D > Executors.newScheduledThreadPool(1, new > NamedThreadFactory("VpcChecker")); > private VpcProvider vpcElement =3D null; > private final List nonSupportedServices =3D > Arrays.asList(Service.SecurityGroup, Service.Firewall); > + private final List supportedProviders =3D > + Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp); >=20 > String _name; > int _cleanupInterval; > @@ -994,9 +995,9 @@ public class VpcManagerImpl implements > VpcManager, Manager{ > //1) in current release, only vpc provider is supported by Vpc o= ffering > List providers =3D > _ntwkMgr.getNtwkOffDistinctProviders(guestNtwkOff.getId()); > for (Provider provider : providers) { > - if (provider !=3D Provider.VPCVirtualRouter) { > - throw new InvalidParameterValueException("Only provider = of type > " + Provider.VPCVirtualRouter.getName() > - + " is supported for network offering that can b= e used in VPC"); > + if (!supportedProviders.contains(provider) ) { > + throw new InvalidParameterValueException("Provider of ty= pe " + > provider.getName() > + + " is not supported for network offerings that > + can be used in VPC"); > } > } >=20