[ https://issues.apache.org/jira/browse/CLOUDSTACK-9401?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15469396#comment-15469396 ]
ASF GitHub Bot commented on CLOUDSTACK-9401: -------------------------------------------- Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1578#discussion_r77755594 --- Diff: server/src/com/cloud/network/element/VirtualRouterElement.java --- @@ -922,10 +921,56 @@ public boolean release(final Network network, final NicProfile nic, final Virtua return true; } + @Override public boolean configDhcpSupportForSubnet(final Network network, final NicProfile nic, final VirtualMachineProfile vm, final DeployDestination dest, - final ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { - if (canHandle(network, Service.Dhcp)) { + final ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { + return configureDhcpSupport(network, nic, vm, dest, Service.Dhcp); + } + + @Override + public boolean configDnsSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { + // Ignore if virtual router is already dhcp provider + if (_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Dhcp, getProvider())) { + return true; + } else { --- End diff -- This ``else`` block is unnecessary since the ``if`` block returns. Please remove it. > 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)