Skip to content

[NSX] Add ACL types support #8224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 11 commits into from
Nov 30, 2023
Merged

[NSX] Add ACL types support #8224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5965a1
NSX: Create segment group on segment creation
nvazquez Nov 13, 2023
28b4fee
Add unit tests
nvazquez Nov 13, 2023
bd9be12
Remove group for segment before removing segment
nvazquez Nov 13, 2023
c6acd8f
Create Distributed Firewall rules
nvazquez Nov 13, 2023
1a24ba6
Remove distributed firewall policy on segment deletion
nvazquez Nov 13, 2023
d72829c
Fix policy rule ID and add more unit tests
nvazquez Nov 14, 2023
167e580
Fix DROP action rules and transform tests
nvazquez Nov 16, 2023
ec719ac
Add new ACL rules
nvazquez Nov 29, 2023
0ed8cd7
Fixes
nvazquez Nov 30, 2023
db11f0d
associate security policies with groups and not to DFW and add deleti…
Pearl1594 Nov 30, 2023
4cf38ce
Fix name convention
nvazquez Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
NSX: Create segment group on segment creation
  • Loading branch information
@nvazquez
nvazquez committed Nov 13, 2023
commit e5965a152f481ad45ff99e735ec33fd180c90e5c
1 change: 1 addition & 0 deletions plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ private Answer executeRequest(CreateNsxSegmentCommand cmd) {
String tier1GatewayName = NsxControllerUtils.getTier1GatewayName(cmd.getDomainId(), cmd.getAccountId(),
cmd.getZoneId(), networkResourceId, isResourceVpc);
nsxApiClient.createSegment(segmentName, tier1GatewayName, gatewayAddress, enforcementPointPath, transportZones);
nsxApiClient.createGroupForSegment(segmentName);
} catch (Exception e) {
LOGGER.error(String.format("Failed to create network: %s", cmd.getNetworkName()));
return new NsxAnswer(cmd, new CloudRuntimeException(e.getMessage()));
Expand Down
24 changes: 24 additions & 0 deletions plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
import com.vmware.nsx_policy.infra.Services;
import com.vmware.nsx_policy.infra.Sites;
import com.vmware.nsx_policy.infra.Tier1s;
import com.vmware.nsx_policy.infra.domains.Groups;
import com.vmware.nsx_policy.infra.sites.EnforcementPoints;
import com.vmware.nsx_policy.infra.tier_0s.LocaleServices;
import com.vmware.nsx_policy.infra.tier_1s.nat.NatRules;
import com.vmware.nsx_policy.model.ApiError;
import com.vmware.nsx_policy.model.DhcpRelayConfig;
import com.vmware.nsx_policy.model.EnforcementPointListResult;
import com.vmware.nsx_policy.model.Group;
import com.vmware.nsx_policy.model.L4PortSetServiceEntry;
import com.vmware.nsx_policy.model.LBAppProfileListResult;
import com.vmware.nsx_policy.model.LBPool;
Expand All @@ -44,6 +46,7 @@
import com.vmware.nsx_policy.model.LBVirtualServer;
import com.vmware.nsx_policy.model.LBVirtualServerListResult;
import com.vmware.nsx_policy.model.LocaleServicesListResult;
import com.vmware.nsx_policy.model.PathExpression;
import com.vmware.nsx_policy.model.PolicyNatRule;
import com.vmware.nsx_policy.model.PolicyNatRuleListResult;
import com.vmware.nsx_policy.model.Segment;
Expand Down Expand Up @@ -97,6 +100,7 @@ public class NsxApiClient {
private static final String SEGMENT_RESOURCE_TYPE = "Segment";
private static final String TIER_0_GATEWAY_PATH_PREFIX = "/infra/tier-0s/";
private static final String TIER_1_GATEWAY_PATH_PREFIX = "/infra/tier-1s/";
private static final String SEGMENTS_PATH = "/infra/segments";

private enum PoolAllocation { ROUTING, LB_SMALL, LB_MEDIUM, LB_LARGE, LB_XLARGE }

Expand Down Expand Up @@ -711,4 +715,24 @@ private String getServiceById(String ruleName) {
}
return null;
}

/**
* Create a Group for the Segment, with the same name as the segment and being the segment the only member of the group
*/
public void createGroupForSegment(String segmentName) {
LOGGER.info(String.format("Creating Group for Segment %s", segmentName));

PathExpression pathExpression = new PathExpression();
List<String> paths = List.of(String.format("%s/%s", SEGMENTS_PATH, segmentName));
pathExpression.setPaths(paths);

Groups service = (Groups) nsxService.apply(Groups.class);
Group group = new Group.Builder()
.setId(segmentName)
.setDisplayName(segmentName)
.setExpression(List.of(pathExpression))
.build();
service.patch("default", segmentName, group);
}

}