Skip to content

NSX: Refactor Network & VPC offering #8110

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 7 commits into from
Oct 23, 2023
Merged

NSX: Refactor Network & VPC offering #8110

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee1174d
[NSX] Refactor API wrapper operations
nvazquez Oct 9, 2023
b564fdb
Merge branch 'nsx-integration' of https://github.com/apache/cloudstac…
Pearl1594 Oct 13, 2023
afb00bb
Network offering changes for NSX
Pearl1594 Oct 17, 2023
4c4ecdb
fix services and provider combination
Pearl1594 Oct 19, 2023
12fb9ec
address comments: rename param
Pearl1594 Oct 23, 2023
0e3fd1f
update nsx_mode parameter
Pearl1594 Oct 23, 2023
386ba2f
Merge branch 'nsx-integration' of https://github.com/apache/cloudstac…
Pearl1594 Oct 23, 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
Prev Previous commit
Merge branch 'nsx-integration' of https://github.com/apache/cloudstack … 
…into nsx-refactor-update-offering
  • Loading branch information
@Pearl1594
Pearl1594 committed Oct 23, 2023
commit 386ba2f3af056feab6772e64696dc6ed6d8eb958
3 changes: 1 addition & 2 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 @@ -233,8 +233,7 @@ private Answer executeRequest(CreateNsxDhcpRelayConfigCommand cmd) {
return new NsxAnswer(cmd, e);
}


String segmentName = NsxControllerUtils.getNsxSegmentId(domainName, accountName, zoneName, vpcName, networkName);
String segmentName = NsxControllerUtils.getNsxSegmentId(domainId, accountId, zoneId, vpcId, networkId);
String dhcpConfigPath = String.format("%s/%s", DHCP_RELAY_CONFIGS_PATH_PREFIX, dhcpRelayConfigName);
try {
Segment segment = nsxApiClient.getSegmentById(segmentName);
Expand Down
9 changes: 4 additions & 5 deletions ...ns/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxControllerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ public static String getNsxSegmentId(long domainId, long accountId, long zoneId,
return String.format("%s-V%s-S%s",segmentName, vpcId, networkId);
}


public static String getNsxDhcpRelayConfigId(String zoneName, String domainName, String accountName, String vpcName, String networkName) {
String suffix = "-Relay";
if (isNull(vpcName)) {
return domainName + "-" + accountName + "-" + zoneName + "-" +networkName + suffix;
public static String getNsxDhcpRelayConfigId(long zoneId, long domainId, long accountId, Long vpcId, long networkId) {
String suffix = "Relay";
if (isNull(vpcId)) {
return String.format("D%s-A%s-Z%s-S%s-%s", domainId, accountId, zoneId, networkId, suffix);
}
return String.format("D%s-A%s-Z%s-V%s-S%s-%s", domainId, accountId, zoneId, vpcId, networkId, suffix);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.