apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.14'

Browse Source
This commit is contained in:
Daan Hoogland 2020-10-21 07:59:03 +00:00
commit 5b3f3512ba
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/main/java/com/cloud/network/Network.java
View File

@ -43,7 +43,21 @@ import com.cloud.utils.fsm.StateObject;
public interface Network extends ControlledEntity, StateObject<Network.State>, InternalIdentity, Identity, Serializable, Displayable {
enum GuestType {
Shared, Isolated, L2
Shared, Isolated, L2;
public static GuestType fromValue(String type) {
if (StringUtils.isBlank(type)) {
return null;
} else if (type.equalsIgnoreCase("Shared")) {
return Shared;
} else if (type.equalsIgnoreCase("Isolated")) {
return Isolated;
} else if (type.equalsIgnoreCase("L2")) {
return L2;
} else {
throw new InvalidParameterValueException("Unexpected Guest type : " + type);
}
}
}
enum PVlanType {

11
api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworksCmd.java
View File

@ -37,6 +37,7 @@ import org.apache.cloudstack.api.response.ZoneResponse;
import com.cloud.network.Network;
import com.cloud.utils.Pair;
import com.google.common.base.Strings;
@APICommand(name = "listNetworks", description = "Lists all available networks.", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@ -53,7 +54,7 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd implements UserC
@Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class, description = "the zone ID of the network")
private Long zoneId;
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of the network. Supported values are: isolated and shared")
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of the network. Supported values are: isolated, l2, shared and all")
private String guestIpType;
@Parameter(name = ApiConstants.IS_SYSTEM, type = CommandType.BOOLEAN, description = "true if network is system, false otherwise")
@ -105,7 +106,13 @@ public class ListNetworksCmd extends BaseListTaggedResourcesCmd implements UserC
}
public String getGuestIpType() {
return guestIpType;
if (!Strings.isNullOrEmpty(guestIpType)) {
if (guestIpType.equalsIgnoreCase("all")) {
return null;
}
return Network.GuestType.fromValue(guestIpType).toString();
}
return null;
}
public Boolean getIsSystem() {