Merge branch 'master' into planner_reserve
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db4f335c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db4f335c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db4f335c Branch: refs/heads/planner_reserve Commit: db4f335c8a29877f644c9fd073d43eabbafe1090 Parents: ed8ff40 d078f92 Author: Prachi Damle <[email protected]> Authored: Thu May 16 11:56:37 2013 -0700 Committer: Prachi Damle <[email protected]> Committed: Thu May 16 11:56:37 2013 -0700 ---------------------------------------------------------------------- api/src/com/cloud/agent/api/PvlanSetupCommand.java | 121 +++++++++++ api/src/com/cloud/event/EventTypes.java | 1 + api/src/com/cloud/network/Networks.java | 1 + .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../api/command/user/network/CreateNetworkCmd.java | 7 + .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 +- .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 8 +- .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 4 +- .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 28 +++- docs/en-US/build-rpm.xml | 8 +- docs/en-US/deployment-architecture-overview.xml | 2 +- docs/en-US/event-framework.xml | 2 +- docs/en-US/gslb.xml | 2 +- docs/en-US/ipv6-support.xml | 2 +- docs/en-US/vmware-cluster-config-dvswitch.xml | 2 +- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 8 +- .../debian/config/etc/init.d/cloud-early-config | 6 + .../kvm/resource/LibvirtComputingResource.java | 76 +++++++ .../hypervisor/kvm/resource/OvsVifDriver.java | 4 +- .../xen/resource/CitrixResourceBase.java | 59 ++++++- .../network/cisco/create-egress-acl-rule.xml | 10 +- .../create-generic-egress-acl-no-protocol-rule.xml | 10 +- .../cisco/create-generic-egress-acl-rule.xml | 10 +- .../cloud/network/cisco/CiscoVnmcConnection.java | 4 +- .../network/cisco/CiscoVnmcConnectionImpl.java | 12 +- .../cloud/network/resource/CiscoVnmcResource.java | 149 ++++++-------- .../cloud/network/element/NetscalerElement.java | 39 +++-- .../cloud/network/resource/NetscalerResource.java | 10 +- 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 +++++++++ server/src/com/cloud/api/ApiDBUtils.java | 5 + server/src/com/cloud/api/ApiDispatcher.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 3 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 2 +- .../com/cloud/capacity/CapacityManagerImpl.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 4 +- .../AgentBasedStandaloneConsoleProxyManager.java | 2 +- server/src/com/cloud/network/NetworkManager.java | 3 +- .../src/com/cloud/network/NetworkManagerImpl.java | 35 +++- .../src/com/cloud/network/NetworkServiceImpl.java | 23 ++- .../network/element/VirtualRouterElement.java | 3 +- .../router/VirtualNetworkApplianceManager.java | 3 +- .../router/VirtualNetworkApplianceManagerImpl.java | 42 ++++- .../cloud/network/vpc/NetworkACLServiceImpl.java | 4 +- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 3 +- .../src/com/cloud/server/ManagementServerImpl.java | 6 +- .../com/cloud/template/TemplateManagerImpl.java | 6 +- server/src/com/cloud/test/DatabaseConfig.java | 4 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 73 +++++++- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../gslb/GlobalLoadBalancingRulesServiceImpl.java | 37 ++-- .../region/gslb/GslbServiceProvider.java | 8 +- .../com/cloud/network/MockNetworkManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 3 +- .../GlobalLoadBalancingRulesServiceImplTest.java | 3 + test/integration/component/test_accounts.py | 71 ++++---- test/integration/component/test_resource_limits.py | 154 +++++++------- test/integration/component/test_storage_motion.py | 6 + .../integration/component/test_vm_passwdenabled.py | 2 +- test/integration/smoke/test_pvlan.py | 86 ++++++++ tools/appliance/build.sh | 2 +- ui/scripts/system.js | 20 ++- utils/src/com/cloud/utils/net/NetUtils.java | 26 +++ utils/test/com/cloud/utils/net/NetUtilsTest.java | 8 + 69 files changed, 1358 insertions(+), 334 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/api/src/com/cloud/event/EventTypes.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/api/src/org/apache/cloudstack/api/ApiConstants.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/server/src/com/cloud/capacity/CapacityManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/configuration/ConfigurationManagerImpl.java index eaafc4b,8878782..9e0c847 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@@ -2673,8 -2657,10 +2673,10 @@@ public class ConfigurationManagerImpl e if (uri != null) { String[] vlan = uri.toString().split("vlan:\\/\\/"); networkVlanId = vlan[1]; + //For pvlan + networkVlanId = networkVlanId.split("-")[0]; } - + if (vlanId != null) { // if vlan is specified, throw an error if it's not equal to network's vlanId if (networkVlanId != null && !networkVlanId.equalsIgnoreCase(vlanId)) { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db4f335c/server/src/com/cloud/vm/UserVmManagerImpl.java ----------------------------------------------------------------------
