Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1371#discussion_r62781459
--- Diff:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
---
@@ -198,14 +199,26 @@ public boolean removeVpcRouterFromGuestNetwork(final
VirtualRouter router, final
return result;
}
- protected boolean setupVpcGuestNetwork(final Network network, final
VirtualRouter router, final boolean add, final NicProfile guestNic) throws
ConcurrentOperationException,
- ResourceUnavailableException {
+ protected boolean setupVpcGuestNetwork(final Network network, final
VirtualRouter router, final boolean add, final NicProfile guestNic)
+ throws ConcurrentOperationException,
ResourceUnavailableException {
boolean result = true;
if (router.getState() == State.Running) {
- final SetupGuestNetworkCommand setupCmd =
_commandSetupHelper.createSetupGuestNetworkCommand((DomainRouterVO) router,
add, guestNic);
-
+ final SetupGuestNetworkCommand setupCmd =
_commandSetupHelper.createSetupGuestNetworkCommand((DomainRouterVO)router, add,
guestNic);
final Commands cmds = new Commands(Command.OnError.Stop);
+ final VpcVO vpc = _vpcDao.findById(router.getVpcId());
+ if
(_vpcOffServiceDao.areServicesSupportedByNetworkOffering(vpc.getVpcOfferingId(),
Service.VPCDynamicRouting)
+ &&
_networkModel.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(),
Service.VPCDynamicRouting)) {
+ try {
+ _commandSetupHelper.createQuaggaConfigCommand(router,
vpc.getId(), cmds);
+ }
+ catch (BadCIDRException ex){
+ s_logger.warn("Unable to configure the VPC network for
dynamic routing " + ex);
+ throw new ResourceUnavailableException("Unable to
configure the VPC network for dynamic routing ," + " virtual router " + router
+ " is not in the right state", DataCenter.class,
--- End diff --
Why are two static string values being concatenated?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
