Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6D5BB200B9D for ; Wed, 7 Sep 2016 15:14:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6C4DA160AC1; Wed, 7 Sep 2016 13:14:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C58B6160AD2 for ; Wed, 7 Sep 2016 15:14:21 +0200 (CEST) Received: (qmail 68644 invoked by uid 500); 7 Sep 2016 13:14:21 -0000 Mailing-List: contact issues-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 issues@cloudstack.apache.org Received: (qmail 68601 invoked by uid 500); 7 Sep 2016 13:14:20 -0000 Delivered-To: apmail-incubator-cloudstack-issues@incubator.apache.org Received: (qmail 68559 invoked by uid 99); 7 Sep 2016 13:14:20 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Sep 2016 13:14:20 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id A5B8C2C1B88 for ; Wed, 7 Sep 2016 13:14:20 +0000 (UTC) Date: Wed, 7 Sep 2016 13:14:20 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: cloudstack-issues@incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CLOUDSTACK-9401) Nuage VSP Plugin : Support for InternalDns including Marvin test coverage MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Wed, 07 Sep 2016 13:14:22 -0000 [ https://issues.apache.org/jira/browse/CLOUDSTACK-9401?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15470598#comment-15470598 ] ASF GitHub Bot commented on CLOUDSTACK-9401: -------------------------------------------- Github user fmaximus commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1578#discussion_r77818579 --- Diff: server/src/com/cloud/network/element/VirtualRouterElement.java --- @@ -988,6 +1016,21 @@ public boolean addDhcpEntry(final Network network, final NicProfile nic, final V return result; } + protected boolean deleteDhcpSupportForSubnet(Network network, Network.Service service) throws ResourceUnavailableException { + if (canHandle(network, service)) { + final List routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); + if (routers == null || routers.size() == 0) { + throw new ResourceUnavailableException("Can't find at least one router!", DataCenter.class, network.getDataCenterId()); + } + try { + return _routerMgr.removeDhcpSupportForSubnet(network, routers); + } catch (final ResourceUnavailableException e) { + s_logger.debug("Router resource unavailable "); --- End diff -- Here we moved existing code from removeDhcpSupportForSubnet to a separate method, containing the service. Another question is, why catch ResourceUnavailableException, if it is also present in the method's throws clause? It then would be logged by the invoking methods. > Nuage VSP Plugin : Support for InternalDns including Marvin test coverage > ------------------------------------------------------------------------- > > Key: CLOUDSTACK-9401 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-9401 > Project: CloudStack > Issue Type: Task > Security Level: Public(Anyone can view this level - this is the default.) > Components: Automation, Network Controller > Reporter: Rahul Singal > Assignee: Nick Livens > > Supporting Internal Dns by using Dns service provider as Virtual Router but Dhcp provider will be NuageVsp. The idea is here is to keep using Internal Dns service of cloudstack when network provider is some other vendor. > A sample network offering will be like below one:- > Service Provider > DHCP NuageVsp > DNS VirtualRouter/VpcVirtualRouter > UserData VirtualRouter/VpcVirtualRouter > Virtual Networking NuageVsp > SourceNat NuageVsp > StaticNat NuageVsp > NetworkAcl/Firewall NuageVsp > Testrun:- > Verify InternalDns on Isolated Network ... === TestName: test_01_Isolated_Network_with_zone | Status : SUCCESS === > ok > Verify InternalDns on Isolated Network with ping by hostname ... === TestName: test_02_Isolated_Network | Status : SUCCESS === > ok > Verify update NetworkDomain for InternalDns on Isolated Network ... === TestName: test_03_Update_Network_with_Domain | Status : SUCCESS === > ok > Verify update NetworkDomain for InternalDns on Isolated Network with ping VM ... === TestName: test_04_Update_Network_with_Domain | Status : SUCCESS === > ok > Verify InternalDns on VPC Network ... === TestName: test_05_VPC_Network_With_InternalDns | Status : SUCCESS === > ok > Verify InternalDns on VPC Network by ping with hostname ... === TestName: test_06_VPC_Network_With_InternalDns | Status : SUCCESS === > ok > ---------------------------------------------------------------------- > Ran 6 tests in 5736.562s > OK > cloudstack$ pep8 --max-line-length=150 test_internal_dns.py > cloudstack$ pyflakes test_internal_dns.py > cloudstack$ -- This message was sent by Atlassian JIRA (v6.3.4#6332)