Skip to content

Commit 0890a9a

Browse files
committed
Netris Integration
1 parent 08ad1c7 commit 0890a9a

File tree

227 files changed

+10616
-1148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+10616
-1148
lines changed

api/src/main/java/com/cloud/configuration/ConfigurationService.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
package com.cloud.configuration;
1818

1919
import java.util.List;
20+
import java.util.Map;
21+
import java.util.Objects;
2022

23+
import com.cloud.network.Network;
24+
import org.apache.cloudstack.api.ApiConstants;
2125
import org.apache.cloudstack.api.command.admin.config.ResetCfgCmd;
2226
import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd;
2327
import org.apache.cloudstack.api.command.admin.network.CreateGuestNetworkIpv6PrefixCmd;
@@ -372,4 +376,16 @@ Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws ConcurrentOpera
372376
List<? extends PortableIp> listPortableIps(long id);
373377

374378
Boolean isAccountAllowedToCreateOfferingsWithTags(IsAccountAllowedToCreateOfferingsWithTagsCmd cmd);
379+
380+
public static final Map<String, String> ProviderDetailKeyMap = Map.of(
381+
Network.Provider.Nsx.getName(), ApiConstants.NSX_DETAIL_KEY,
382+
Network.Provider.Netris.getName(), ApiConstants.NETRIS_DETAIL_KEY
383+
);
384+
385+
public static boolean IsIpRangeForProvider(Network.Provider provider) {
386+
if (Objects.isNull(provider)) {
387+
return false;
388+
}
389+
return ProviderDetailKeyMap.containsKey(provider.getName());
390+
}
375391
}

api/src/main/java/com/cloud/event/EventTypes.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ public class EventTypes {
496496

497497
public static final String EVENT_ZONE_VLAN_ASSIGN = "ZONE.VLAN.ASSIGN";
498498
public static final String EVENT_ZONE_VLAN_RELEASE = "ZONE.VLAN.RELEASE";
499+
public static final String EVENT_ZONE_VXLAN_ASSIGN = "ZONE.VXLAN.ASSIGN";
500+
public static final String EVENT_ZONE_VXLAN_RELEASE = "ZONE.VXLAN.RELEASE";
499501

500502
// Projects
501503
public static final String EVENT_PROJECT_CREATE = "PROJECT.CREATE";

api/src/main/java/com/cloud/network/IpAddress.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,5 @@ enum Purpose {
9999

100100
boolean isForSystemVms();
101101

102+
boolean isForRouter();
102103
}

api/src/main/java/com/cloud/network/Network.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ public static class Provider {
206206
public static final Provider Tungsten = new Provider("Tungsten", false);
207207

208208
public static final Provider Nsx = new Provider("Nsx", false);
209+
public static final Provider Netris = new Provider("Netris", false);
209210

210211
private final String name;
211212
private final boolean isExternal;

api/src/main/java/com/cloud/network/Networks.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ public <T> URI toUri(T value) {
129129
UnDecided(null, null),
130130
OpenDaylight("opendaylight", String.class),
131131
TUNGSTEN("tf", String.class),
132-
NSX("nsx", String.class);
132+
NSX("nsx", String.class),
133+
Netris("netris", String.class);
133134

134135
private final String scheme;
135136
private final Class<?> type;

0 commit comments

Comments
 (0)