Github user nlivens commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/801#discussion_r43090554
--- Diff:
plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
---
@@ -205,6 +250,75 @@ public boolean implement(Network network,
NetworkOffering offering, DeployDestin
return false;
}
+ final boolean egressDefaultPolicy =
offering.getEgressDefaultPolicy();
+ Domain networkDomain = _domainDao.findById(network.getDomainId());
+ boolean isFirewallServiceSupported =
_networkModel.areServicesSupportedByNetworkOffering(offering.getId(),
Service.Firewall);
+ List<String> dnsServers = _nuageVspManager.getDnsDetails(network);
+
+ boolean isL2Network = false, isL3Network = false, isShared = false;
+ String subnetUuid = network.getUuid();
+ if (offering.getGuestType() == Network.GuestType.Shared) {
+ isShared = true;
+ subnetUuid = networkDomain.getUuid();
+ } else if
(_ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(),
Service.SourceNat)
+ ||
_ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(),
Service.StaticNat)
+ ||
_ntwkOfferingSrvcDao.areServicesSupportedByNetworkOffering(offering.getId(),
Service.Connectivity)) {
+ isL3Network = true;
+ } else {
+ isL2Network = true;
+ }
+
+ String preConfiguredDomainTemplateName =
getPreConfiguredDomainTemplateName(network, offering);
+ List<FirewallRuleVO> firewallIngressRulesToApply =
+
_firewallRulesDao.listByNetworkPurposeTrafficType(network.getId(),
FirewallRule.Purpose.Firewall, FirewallRule.TrafficType.Ingress);
+ for (FirewallRuleVO rule : firewallIngressRulesToApply) {
+ // load cidrs if any
+
rule.setSourceCidrList(_firewallRulesCidrsDao.getSourceCidrs(rule.getId()));
+ }
+
+ List<FirewallRuleVO> firewallEgressRulesToApply =
+
_firewallRulesDao.listByNetworkPurposeTrafficType(network.getId(),
FirewallRule.Purpose.Firewall, FirewallRule.TrafficType.Egress);
+ for (FirewallRuleVO rule : firewallEgressRulesToApply) {
+ // load cidrs if any
+
rule.setSourceCidrList(_firewallRulesCidrsDao.getSourceCidrs(rule.getId()));
+ }
+
+ List<Map<String, Object>> ingressFirewallRules =
Lists.transform(firewallIngressRulesToApply, new Function<FirewallRuleVO,
Map<String, Object>>() {
+ @Override
+ public Map<String, Object> apply(FirewallRuleVO
firewallRuleVO) {
+ return getACLRuleDetails(firewallRuleVO,
egressDefaultPolicy);
+ }
+ });
+
+ List<Map<String, Object>> egressFirewallRules =
Lists.transform(firewallEgressRulesToApply, new Function<FirewallRuleVO,
Map<String, Object>>() {
--- End diff --
Refactored so the transformation is done in a method used for retrieving
both lists.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
