rhtyd closed pull request #3053: ipv6: Advanced Networking Security Groups are
supported
URL: https://github.com/apache/cloudstack/pull/3053
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index e4fbf322b6f..b451974851b 100644
---
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2151,9 +2151,6 @@ public Network createGuestNetwork(final long
networkOfferingId, final String nam
} else if (zone.getNetworkType() == NetworkType.Advanced) {
if (zone.isSecurityGroupEnabled()) {
- if (ipv6) {
- throw new InvalidParameterValueException("IPv6 is not
supported with security group!");
- }
if (isolatedPvlan != null) {
throw new InvalidParameterValueException("Isolated Private
VLAN is not supported with security group!");
}
diff --git a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
index ee880e62a84..1d8355ab584 100644
--- a/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
+++ b/server/src/main/java/com/cloud/network/guru/DirectNetworkGuru.java
@@ -222,9 +222,6 @@ public Network design(NetworkOffering offering,
DeploymentPlan plan, Network use
boolean isSecurityGroupEnabled =
_networkModel.areServicesSupportedByNetworkOffering(offering.getId(),
Service.SecurityGroup);
if (isSecurityGroupEnabled) {
- if (userSpecified.getIp6Cidr() != null) {
- throw new InvalidParameterValueException("Didn't support
security group with IPv6");
- }
config.setName("SecurityGroupEnabledNetwork");
config.setDisplayText("SecurityGroupEnabledNetwork");
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
