Merge branch 'pvlan'
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver60/patch
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d2c0c48
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d2c0c48
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d2c0c48
Branch: refs/heads/rbd-snap-clone
Commit: 2d2c0c48cdc29416e05e224861fd723ca795d6ac
Parents: 076c32d 2bcf716
Author: Sheng Yang <[email protected]>
Authored: Wed May 15 16:07:21 2013 -0700
Committer: Sheng Yang <[email protected]>
Committed: Wed May 15 16:08:08 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/agent/api/PvlanSetupCommand.java | 121 ++++++++++++
api/src/com/cloud/network/Networks.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../api/command/user/network/CreateNetworkCmd.java | 7 +
.../kvm/resource/LibvirtComputingResource.java | 76 ++++++++
.../hypervisor/kvm/resource/OvsVifDriver.java | 4 +-
.../xen/resource/CitrixResourceBase.java | 59 ++++++-
scripts/vm/hypervisor/xenserver/ovs-get-bridge.sh | 27 +++
.../vm/hypervisor/xenserver/ovs-get-dhcp-iface.sh | 25 +++
scripts/vm/hypervisor/xenserver/ovs-pvlan | 145 +++++++++++++++
scripts/vm/hypervisor/xenserver/xenserver60/patch | 7 +-
scripts/vm/network/ovs-pvlan-cleanup.sh | 23 +++
scripts/vm/network/ovs-pvlan-dhcp-host.sh | 123 ++++++++++++
scripts/vm/network/ovs-pvlan-vm.sh | 99 ++++++++++
.../configuration/ConfigurationManagerImpl.java | 2 +
server/src/com/cloud/network/NetworkManager.java | 3 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 35 +++-
.../src/com/cloud/network/NetworkServiceImpl.java | 21 ++-
.../network/element/VirtualRouterElement.java | 3 +-
.../router/VirtualNetworkApplianceManager.java | 3 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 42 ++++-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 52 +++++-
.../com/cloud/network/MockNetworkManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 3 +-
test/integration/smoke/test_pvlan.py | 86 +++++++++
ui/scripts/system.js | 20 ++-
utils/src/com/cloud/utils/net/NetUtils.java | 26 +++
utils/test/com/cloud/utils/net/NetUtilsTest.java | 8 +
29 files changed, 994 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --cc api/src/org/apache/cloudstack/api/ApiConstants.java
index 1b745cf,9581f54..f09a00b
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@@ -227,9 -221,9 +227,10 @@@ public class ApiConstants
public static final String VIRTUAL_MACHINE_ID = "virtualmachineid";
public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids";
public static final String VLAN = "vlan";
+ public static final String VLAN_RANGE = "vlanrange";
public static final String REMOVE_VLAN="removevlan";
public static final String VLAN_ID = "vlanid";
+ public static final String ISOLATED_PVLAN = "isolatedpvlan";
public static final String VM_AVAILABLE = "vmavailable";
public static final String VM_LIMIT = "vmlimit";
public static final String VM_TOTAL = "vmtotal";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/api/src/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --cc
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 734f72f,d616e1b..a166347
---
a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@@ -83,6 -130,6 +83,7 @@@ import com.cloud.agent.api.PlugNicComma
import com.cloud.agent.api.PoolEjectCommand;
import com.cloud.agent.api.PrepareForMigrationAnswer;
import com.cloud.agent.api.PrepareForMigrationCommand;
++import com.cloud.agent.api.PvlanSetupCommand;
import com.cloud.agent.api.ReadyAnswer;
import com.cloud.agent.api.ReadyCommand;
import com.cloud.agent.api.RebootAnswer;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --cc scripts/vm/hypervisor/xenserver/xenserver60/patch
index 6d81979,9af32b1..26205f2
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@@ -69,5 -67,9 +69,10 @@@ bumpUpPriority.sh=../../../../network/d
swift=..,0755,/opt/xensource/bin
swiftxen=..,0755,/etc/xapi.d/plugins
s3xen=..,0755,/etc/xapi.d/plugins
+add_to_vcpus_params_live.sh=..,0755,/opt/xensource/bin
-
+ ovs-pvlan=..,0755,/etc/xapi.d/plugins
+ ovs-pvlan-dhcp-host.sh=../../../network,0755,/opt/xensource/bin
+ ovs-pvlan-vm.sh=../../../network,0755,/opt/xensource/bin
+ ovs-pvlan-cleanup.sh=../../../network,0755,/opt/xensource/bin
+ ovs-get-dhcp-iface.sh=..,0755,/opt/xensource/bin
+ ovs-get-bridge.sh=..,0755,/opt/xensource/bin
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/NetworkManager.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/NetworkManager.java
index 15bc61c,e111351..08198ee
--- a/server/src/com/cloud/network/NetworkManager.java
+++ b/server/src/com/cloud/network/NetworkManager.java
@@@ -129,8 -127,9 +129,9 @@@ public interface NetworkManager
boolean destroyNetwork(long networkId, ReservationContext context);
Network createGuestNetwork(long networkOfferingId, String name, String
displayText, String gateway, String cidr,
- String vlanId, String networkDomain, Account owner, Long
domainId, PhysicalNetwork physicalNetwork,
- long zoneId, ACLType aclType, Boolean subdomainAccess, Long
vpcId, String ip6Gateway, String ip6Cidr,
- String isolatedPvlan)
+ String vlanId, String networkDomain, Account
owner, Long domainId, PhysicalNetwork physicalNetwork,
- long zoneId, ACLType aclType, Boolean
subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr, Boolean
displayNetworkEnabled)
++ long zoneId, ACLType aclType, Boolean
subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr,
++ Boolean displayNetworkEnabled, String
isolatedPvlan)
throws ConcurrentOperationException,
InsufficientCapacityException, ResourceAllocationException;
/**
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/NetworkManagerImpl.java
index 9440286,7a09eb5..01a0384d
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@@ -1898,9 -1872,10 +1898,10 @@@ public class NetworkManagerImpl extend
@Override
@DB
- public Network createGuestNetwork(long networkOfferingId, String name,
String displayText, String gateway,
- String cidr, String vlanId, String networkDomain, Account owner,
Long domainId,
- PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean
subdomainAccess, Long vpcId,
- String ip6Gateway, String ip6Cidr, String isolatedPvlan)
+ public Network createGuestNetwork(long networkOfferingId, String name,
String displayText, String gateway,
+ String cidr, String vlanId, String
networkDomain, Account owner, Long domainId,
- PhysicalNetwork pNtwk, long zoneId,
ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String
ip6Cidr, Boolean isDisplayNetworkEnabled)
++ PhysicalNetwork pNtwk, long zoneId,
ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String
ip6Cidr,
++ Boolean isDisplayNetworkEnabled, String
isolatedPvlan)
throws ConcurrentOperationException,
InsufficientCapacityException, ResourceAllocationException {
NetworkOfferingVO ntwkOff =
_networkOfferingDao.findById(networkOfferingId);
@@@ -2758,7 -2708,7 +2769,7 @@@
guestNetwork =
createGuestNetwork(requiredOfferings.get(0).getId(), owner.getAccountName() +
"-network"
, owner.getAccountName() + "-network", null, null,
null, null, owner, null, physicalNetwork,
zoneId, ACLType.Account,
- null, null, null, null, true);
- null, null, null, null, null);
++ null, null, null, null, true, null);
if (guestNetwork == null) {
s_logger.warn("Failed to create default Virtual network
for the account " + accountId + "in zone " + zoneId);
throw new CloudRuntimeException("Failed to create a Guest
Isolated Networks with SourceNAT " +
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/NetworkServiceImpl.java
index 8b11819,ebada5c..2bc3913
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@@ -950,8 -828,7 +950,9 @@@ public class NetworkServiceImpl extend
String endIPv6 = cmd.getEndIpv6();
String ip6Gateway = cmd.getIp6Gateway();
String ip6Cidr = cmd.getIp6Cidr();
+ Boolean displayNetwork = cmd.getDisplayNetwork();
+ Long aclId = cmd.getAclId();
+ String isolatedPvlan = cmd.getIsolatedPvlan();
// Validate network offering
NetworkOfferingVO ntwkOff =
_networkOfferingDao.findById(networkOfferingId);
@@@ -1142,7 -1014,15 +1143,15 @@@
throw new InvalidParameterValueException("Can only
support create IPv6 network with advance shared network!");
}
}
-
+
+ if (isolatedPvlan != null && (zone.getNetworkType() !=
NetworkType.Advanced || ntwkOff.getGuestType() != Network.GuestType.Shared)) {
+ throw new InvalidParameterValueException("Can only support
create Private VLAN network with advance shared network!");
+ }
-
++
+ if (isolatedPvlan != null && ipv6) {
+ throw new InvalidParameterValueException("Can only support
create Private VLAN network with IPv4!");
+ }
-
++
// Regular user can create Guest Isolated Source Nat enabled network
only
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL
&& (ntwkOff.getTrafficType() != TrafficType.Guest ||
ntwkOff.getGuestType() != Network.GuestType.Isolated
@@@ -1174,7 -1054,10 +1183,11 @@@
if (ipv6 && providersConfiguredForExternalNetworking(ntwkProviders)) {
throw new InvalidParameterValueException("Cannot support IPv6
on network offering with external devices!");
}
+
+ if (isolatedPvlan != null &&
providersConfiguredForExternalNetworking(ntwkProviders)) {
+ throw new InvalidParameterValueException("Cannot support
private vlan on network offering with external devices!");
+ }
-
++
if (cidr != null &&
providersConfiguredForExternalNetworking(ntwkProviders)) {
if (ntwkOff.getGuestType() == GuestType.Shared &&
(zone.getNetworkType() == NetworkType.Advanced) &&
isSharedNetworkOfferingWithServices(networkOfferingId)) {
@@@ -1261,13 -1126,10 +1274,14 @@@
if (_configMgr.isOfferingForVpc(ntwkOff)){
throw new InvalidParameterValueException("Network offering
can be used for VPC networks only");
}
+ if (ntwkOff.getInternalLb()) {
+ throw new InvalidParameterValueException("Internal Lb can be
enabled on vpc networks only");
+ }
+
- network = _networkMgr.createGuestNetwork(networkOfferingId, name,
displayText, gateway, cidr, vlanId,
- networkDomain, owner, sharedDomainId, pNtwk, zoneId,
aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr, displayNetwork);
+ network = _networkMgr.createGuestNetwork(networkOfferingId, name,
displayText, gateway, cidr, vlanId,
+ networkDomain, owner, sharedDomainId, pNtwk, zoneId,
aclType, subdomainAccess, vpcId,
- ip6Gateway, ip6Cidr, isolatedPvlan);
- }
++ ip6Gateway, ip6Cidr, displayNetwork, isolatedPvlan);
+ }
if (caller.getType() == Account.ACCOUNT_TYPE_ADMIN && createVlan) {
// Create vlan ip range
@@@ -3812,9 -3375,8 +3826,8 @@@
networkOwnerId, pNtwk.getDataCenterId());
if (privateNetwork == null) {
//create Guest network
- privateNetwork = _networkMgr.createGuestNetwork(ntwkOff.getId(),
networkName, displayText, gateway, cidr, vlan,
- null, owner, null, pNtwk, pNtwk.getDataCenterId(),
ACLType.Account, null, null, null, null, null);
+ privateNetwork = _networkMgr.createGuestNetwork(ntwkOff.getId(),
networkName, displayText, gateway, cidr, vlan,
- null, owner, null, pNtwk, pNtwk.getDataCenterId(),
ACLType.Account, null, vpcId, null, null, true);
-
++ null, owner, null, pNtwk, pNtwk.getDataCenterId(),
ACLType.Account, null, vpcId, null, null, true, null);
s_logger.debug("Created private network " + privateNetwork);
} else {
s_logger.debug("Private network already exists: " +
privateNetwork);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
----------------------------------------------------------------------
diff --cc
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
index a80c560,075b014..9852c47
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@@ -104,12 -105,4 +105,12 @@@ public interface VirtualNetworkApplianc
boolean applyUserData(Network config, NicProfile nic,
VirtualMachineProfile<UserVm> vm, DeployDestination dest,
List<DomainRouterVO> routers) throws
ResourceUnavailableException;
+
+ boolean applyLoadBalancingRules(Network network, List<? extends
LoadBalancingRule> rules, List<? extends VirtualRouter> routers) throws
ResourceUnavailableException;
+
+
+ boolean configDhcpForSubnet(Network network, NicProfile nic,
VirtualMachineProfile<UserVm> uservm, DeployDestination dest,
List<DomainRouterVO> routers) throws ResourceUnavailableException ;
+
+ boolean removeDhcpSupportForSubnet(Network network, List<DomainRouterVO>
routers) throws ResourceUnavailableException;
+
- }
+ }
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 2335416,18690d7..1aab732
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@@ -2024,14 -1964,9 +2024,13 @@@ public class VpcManagerImpl extends Man
validateNtwkOffForNtwkInVpc(null, ntwkOffId, cidr, networkDomain,
vpc, gateway, owner);
//2) Create network
- Network guestNetwork = _ntwkMgr.createGuestNetwork(ntwkOffId, name,
displayText, gateway, cidr, vlanId,
- networkDomain, owner, domainId, pNtwk, zoneId, aclType,
subdomainAccess, vpcId, null, null, null);
+ Network guestNetwork = _ntwkMgr.createGuestNetwork(ntwkOffId, name,
displayText, gateway, cidr, vlanId,
- networkDomain, owner, domainId, pNtwk, zoneId, aclType,
subdomainAccess, vpcId, null, null, isDisplayNetworkEnabled);
-
++ networkDomain, owner, domainId, pNtwk, zoneId, aclType,
subdomainAccess, vpcId, null, null, isDisplayNetworkEnabled, null);
+ if(guestNetwork != null){
+ guestNetwork.setNetworkACLId(aclId);
+ _ntwkDao.update(guestNetwork.getId(), (NetworkVO)guestNetwork);
+ }
return guestNetwork;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index 0f6adc0,683f0da..8b1a9af
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@@ -2191,7 -2165,7 +2192,7 @@@ public class UserVmManagerImpl extends
s_logger.debug("Creating network for account " + owner +
" from the network offering id=" +requiredOfferings.get(0).getId() + " as a
part of deployVM process");
Network newNetwork =
_networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(),
owner.getAccountName() + "-network",
owner.getAccountName() + "-network", null, null,
- null, null, owner, null, physicalNetwork,
zone.getId(), ACLType.Account, null, null, null, null, true);
- null, null, owner, null, physicalNetwork,
zone.getId(), ACLType.Account, null, null, null, null, null);
++ null, null, owner, null, physicalNetwork,
zone.getId(), ACLType.Account, null, null, null, null, true, null);
defaultNetwork = _networkDao.findById(newNetwork.getId());
} else if (virtualNetworks.size() > 1) {
throw new InvalidParameterValueException(
@@@ -4038,7 -4053,7 +4086,7 @@@
requiredOfferings.get(0).getId() + " as a
part of deployVM process");
Network newNetwork =
_networkMgr.createGuestNetwork(requiredOfferings.get(0).getId(),
newAccount.getAccountName() + "-network",
newAccount.getAccountName() + "-network", null, null,
- null, null, newAccount, null,
physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true);
- null, null, newAccount, null,
physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, null);
++ null, null, newAccount, null,
physicalNetwork, zone.getId(), ACLType.Account, null, null, null, null, true,
null);
// if the network offering has persistent set to
true, implement the network
if (requiredOfferings.get(0).getIsPersistent()) {
DeployDestination dest = new
DeployDestination(zone, null, null, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/test/com/cloud/network/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --cc server/test/com/cloud/network/MockNetworkManagerImpl.java
index 7ba34c7,3381d60..87431ab
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@@@ -272,7 -249,7 +272,7 @@@ public class MockNetworkManagerImpl ext
@Override
public Network createGuestNetwork(long networkOfferingId, String name,
String displayText, String gateway, String cidr, String vlanId, String
networkDomain, Account owner, Long domainId,
- PhysicalNetwork physicalNetwork, long
zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6,
String cidrv6, Boolean displayNetworkEnabled) throws
ConcurrentOperationException, InsufficientCapacityException,
ResourceAllocationException {
- PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType,
Boolean subdomainAccess, Long vpcId, String gatewayv6, String cidrv6, String
isolatedPvlan) throws ConcurrentOperationException,
InsufficientCapacityException, ResourceAllocationException {
++ PhysicalNetwork physicalNetwork, long
zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6,
String cidrv6, Boolean displayNetworkEnabled, String isolatedPvlan) throws
ConcurrentOperationException, InsufficientCapacityException,
ResourceAllocationException {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --cc server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index 97775b1,7dcc970..3e6a08b
--- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
@@@ -867,8 -830,9 +867,9 @@@ public class MockNetworkManagerImpl ext
*/
@Override
public Network createGuestNetwork(long networkOfferingId, String name,
String displayText, String gateway,
- String cidr, String vlanId, String networkDomain, Account owner,
Long domainId,
- PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType,
Boolean subdomainAccess, Long vpcId,
- String gatewayv6, String cidrv6, String isolatedPvlan)
+ String cidr, String vlanId, String
networkDomain, Account owner, Long domainId,
- PhysicalNetwork physicalNetwork, long
zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6,
String cidrv6, Boolean displayNetworkEnabled)
++ PhysicalNetwork physicalNetwork, long
zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String gatewayv6,
String cidrv6,
++ Boolean displayNetworkEnabled, String
isolatedPvlan)
throws ConcurrentOperationException,
InsufficientCapacityException, ResourceAllocationException {
// TODO Auto-generated method stub
return null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/ui/scripts/system.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d2c0c48/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
