Skip to content

Filter netris vNets only by VPC ID as filter by site isn't working as expected on Netris end #11617

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 1 commit into from
Sep 16, 2025
Merged

Filter netris vNets only by VPC ID as filter by site isn't working as expected on Netris end #11617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 7 additions & 10 deletions ...work-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,9 +1250,7 @@ private VnetResAddBody updateVnetInternal(VPCListing associatedVpc, String netri
try {
FilterByVpc vpcFilter = new FilterByVpc();
vpcFilter.add(associatedVpc.getId());
FilterBySites siteFilter = new FilterBySites();
siteFilter.add(siteId);
List<VnetsBody> vnetsList = getVnets(associatedVpc, prevVnetName, siteFilter, vpcFilter);
List<VnetsBody> vnetsList = getVnets(associatedVpc, prevVnetName, vpcFilter);
if (CollectionUtils.isEmpty(vnetsList)) {
String errorMsg = String.format("Could not find vNet with name: %s", prevVnetName);
logger.error(errorMsg);
Expand Down Expand Up @@ -1355,9 +1353,7 @@ public boolean deleteVnet(DeleteNetrisVnetCommand cmd) {
String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetCidr);
FilterByVpc vpcFilter = new FilterByVpc();
vpcFilter.add(associatedVpc.getId());
FilterBySites siteFilter = new FilterBySites();
siteFilter.add(siteId);
deleteVnetInternal(associatedVpc, siteFilter, vpcFilter, netrisVnetName, vNetName);
deleteVnetInternal(associatedVpc, vpcFilter, netrisVnetName, vNetName);

logger.debug("Successfully deleted vNet {}", vNetName);
deleteSubnetInternal(vpcFilter, netrisVnetName, netrisSubnetName);
Expand Down Expand Up @@ -1750,10 +1746,11 @@ private boolean updateSnatRuleInternal(String snatRuleName, String snatIP, Strin
return true;
}

private List<VnetsBody> getVnets(VPCListing associatedVpc, String netrisVnetName, FilterBySites siteFilter, FilterByVpc vpcFilter) {
private List<VnetsBody> getVnets(VPCListing associatedVpc, String netrisVnetName, FilterByVpc vpcFilter) {
// Filter by site not working as expected, so filtering by VPC only and then filtering by name in the code
try {
VNetApi vNetApi = apiClient.getApiStubForMethod(VNetApi.class);
VnetResListBody vnetList = vNetApi.apiV2VnetGet(siteFilter, vpcFilter);
VnetResListBody vnetList = vNetApi.apiV2VnetGet(null, vpcFilter);
if (vnetList == null || !vnetList.isIsSuccess()) {
throw new CloudRuntimeException(String.format("Failed to list vNets for the given VPC: %s and site: %s", associatedVpc.getName(), siteName));
}
Expand All @@ -1764,10 +1761,10 @@ private List<VnetsBody> getVnets(VPCListing associatedVpc, String netrisVnetName
return Collections.emptyList();
}

private void deleteVnetInternal(VPCListing associatedVpc, FilterBySites siteFilter, FilterByVpc vpcFilter, String netrisVnetName, String vNetName) {
private void deleteVnetInternal(VPCListing associatedVpc, FilterByVpc vpcFilter, String netrisVnetName, String vNetName) {
try {
VNetApi vNetApi = apiClient.getApiStubForMethod(VNetApi.class);
List<VnetsBody> vnetsList = getVnets(associatedVpc, netrisVnetName, siteFilter, vpcFilter);
List<VnetsBody> vnetsList = getVnets(associatedVpc, netrisVnetName, vpcFilter);
if (CollectionUtils.isEmpty(vnetsList)) {
logger.debug("vNet: {} for the given VPC: {} appears to already be deleted on Netris", vNetName, associatedVpc.getName());
return;
Expand Down
Loading