You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2013/01/18 23:23:43 UTC
[50/50] [abbrv] git commit: Merge branch 'master' into
add_remove_nics pulling in network-refactor merge to master
Updated Branches:
refs/heads/add_remove_nics c093d650c -> 42e4961da
Merge branch 'master' into add_remove_nics
pulling in network-refactor merge to master
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/42e4961d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/42e4961d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/42e4961d
Branch: refs/heads/add_remove_nics
Commit: 42e4961da21dde4108820e3800a3a8a86d733beb
Parents: c093d65 e8c0c1a
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Fri Jan 18 15:24:08 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Fri Jan 18 15:24:08 2013 -0700
----------------------------------------------------------------------
.../com/cloud/exception/RequestLimitException.java | 43 +
api/src/com/cloud/network/NetworkModel.java | 252 +
api/src/com/cloud/network/NetworkService.java | 38 +-
api/src/com/cloud/network/element/IpDeployer.java | 3 +-
.../element/RemoteAccessVPNServiceProvider.java | 3 +-
.../element/Site2SiteVpnServiceProvider.java | 4 +-
api/src/com/cloud/server/ManagementService.java | 11 +-
api/src/org/apache/cloudstack/acl/APIChecker.java | 3 +-
.../org/apache/cloudstack/acl/APILimitChecker.java | 30 +
.../api/command/admin/host/ListHostsCmd.java | 9 +-
client/pom.xml | 5 +
client/tomcatconf/commands.properties.in | 5 +
client/tomcatconf/components.xml.in | 59 +
.../network/resource/TrafficSentinelResource.java | 2 +-
.../config/opt/cloud/bin/checkbatchs2svpn.sh | 25 +
plugins/api/rate-limit/pom.xml | 51 +
.../command/admin/ratelimit/ResetApiLimitCmd.java | 99 +
.../api/command/user/ratelimit/GetApiLimitCmd.java | 89 +
.../cloudstack/api/response/ApiLimitResponse.java | 82 +
.../cloudstack/ratelimit/ApiRateLimitService.java | 37 +
.../ratelimit/ApiRateLimitServiceImpl.java | 196 +
.../cloudstack/ratelimit/EhcacheLimitStore.java | 99 +
.../apache/cloudstack/ratelimit/LimitStore.java | 51 +
.../apache/cloudstack/ratelimit/StoreEntry.java | 33 +
.../cloudstack/ratelimit/StoreEntryImpl.java | 64 +
.../cloudstack/ratelimit/ApiRateLimitTest.java | 226 +
.../cloudstack/ratelimit/integration/APITest.java | 211 +
.../ratelimit/integration/LoginResponse.java | 142 +
.../integration/RateLimitIntegrationTest.java | 214 +
.../kvm/resource/LibvirtComputingResource.java | 7 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 4 +-
.../vmware/manager/VmwareManagerImpl.java | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
.../element/ElasticLoadBalancerElement.java | 4 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 21 +-
.../element/F5ExternalLoadBalancerElement.java | 7 +-
.../cloud/network/resource/F5BigIpResource.java | 2 +-
.../element/JuniperSRXExternalFirewallElement.java | 8 +-
.../cloud/network/resource/JuniperSrxResource.java | 2 +-
.../cloud/network/element/NetscalerElement.java | 8 +-
.../cloud/network/resource/NetscalerResource.java | 2 +-
.../cloud/network/element/NiciraNvpElement.java | 111 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 9 +-
.../cloud/network/resource/NiciraNvpResource.java | 2 +-
.../network/element/NiciraNvpElementTest.java | 9 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 13 +-
.../src/com/cloud/network/element/OvsElement.java | 2 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 19 +-
plugins/pom.xml | 1 +
pom.xml | 37 +-
server/src/com/cloud/acl/DomainChecker.java | 24 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 31 +-
.../cloud/agent/manager/DirectAgentAttache.java | 13 +-
server/src/com/cloud/api/ApiDBUtils.java | 25 +-
server/src/com/cloud/api/ApiDispatcher.java | 7 +-
server/src/com/cloud/api/ApiServer.java | 15 +-
server/src/com/cloud/api/ApiServlet.java | 6 +-
.../com/cloud/async/AsyncJobExecutorContext.java | 4 +-
.../cloud/async/AsyncJobExecutorContextImpl.java | 9 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 2 +-
.../cloud/baremetal/ExternalDhcpResourceBase.java | 2 +-
.../com/cloud/baremetal/PxeServerResourceBase.java | 2 +-
server/src/com/cloud/configuration/Config.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 64 +-
.../configuration/DefaultComponentLibrary.java | 4 +
.../consoleproxy/ConsoleProxyManagerImpl.java | 15 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 4 +-
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 4 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 4 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 8 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 10 +-
.../ExternalLoadBalancerUsageManagerImpl.java | 2 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 2 +-
server/src/com/cloud/network/NetworkManager.java | 231 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 5021 ++-------------
server/src/com/cloud/network/NetworkModelImpl.java | 1839 ++++++
.../src/com/cloud/network/NetworkRuleApplier.java | 28 +
.../src/com/cloud/network/NetworkServiceImpl.java | 2885 +++++++++
.../network/element/CloudZonesNetworkElement.java | 4 +-
.../network/element/VirtualRouterElement.java | 13 +-
.../network/element/VpcVirtualRouterElement.java | 13 +-
.../network/firewall/FirewallManagerImpl.java | 81 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 5 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 14 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 11 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 69 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 104 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 59 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 45 +-
.../network/security/SecurityGroupManagerImpl.java | 9 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 4 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 34 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 28 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 12 +-
server/src/com/cloud/resource/DiscovererBase.java | 4 +-
.../cloud/resource/DummyHostServerResource.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 1 +
.../src/com/cloud/server/ManagementServerImpl.java | 37 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 4 +-
.../secondary/SecondaryStorageManagerImpl.java | 12 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 56 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 15 +-
.../test/com/cloud/alert/MockAlertManagerImpl.java | 87 +
server/test/com/cloud/api/APITest.java | 39 +-
server/test/com/cloud/api/ListPerfTest.java | 9 +-
.../com/cloud/network/MockFirewallManagerImpl.java | 202 +
.../com/cloud/network/MockNetworkManagerImpl.java | 662 +--
.../com/cloud/network/MockNetworkModelImpl.java | 809 +++
.../com/cloud/network/MockRulesManagerImpl.java | 312 +
.../test/com/cloud/network/NetworkManagerTest.java | 66 +
.../NetworkManagerTestComponentLibrary.java | 104 +
.../test/com/cloud/network/NetworkModelTest.java | 88 +
.../network/firewall/FirewallManagerTest.java | 177 +
.../security/SecurityGroupManagerImpl2Test.java | 2 +
.../vpn/MockRemoteAccessVPNServiceProvider.java | 78 +
.../com/cloud/network/vpn/RemoteAccessVpnTest.java | 109 +
.../cloud/resource/MockResourceManagerImpl.java | 601 ++
.../test/com/cloud/user/MockDomainManagerImpl.java | 4 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 1243 ++--
.../cloud/vpc/MockSite2SiteVpnServiceProvider.java | 86 +
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 391 ++
server/test/com/cloud/vpc/Site2SiteVpnTest.java | 98 +
server/test/resources/network-mgr-component.xml | 184 +
setup/db/db/schema-40to410.sql | 2 +
ui/index.jsp | 2 +-
ui/scripts/instanceWizard.js | 83 +-
ui/scripts/ui-custom/instanceWizard.js | 19 +-
.../utils/exception/CSExceptionErrorCode.java | 1 +
132 files changed, 12275 insertions(+), 6457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42e4961d/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42e4961d/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index 81008ee,5891056..0414d92
mode 100755,100644..100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/42e4961d/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index c1a9b3a,e0647bb..626bbb4
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@@ -2554,40 -2536,23 +2557,40 @@@ public class VirtualMachineManagerImpl
if (broadcastUri != null) {
nic = _nicsDao.findByNetworkIdInstanceIdAndBroadcastUri(network.getId(), vm.getId(), broadcastUri.toString());
} else {
- nic = _networkMgr.getNicInNetwork(vm.getId(), network.getId());
+ nic = _networkModel.getNicInNetwork(vm.getId(), network.getId());
}
+
+ if (nic == null){
+ s_logger.warn("Could not get a nic with " + network);
+ return false;
+ }
+ // don't delete default NIC on a user VM
+ if (nic.isDefaultNic() && vm.getType() == VirtualMachine.Type.User ) {
+ s_logger.warn("Failed to remove nic from " + vm + " in " + network + ", nic is default.");
+ throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic is default.");
+ }
+
NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(),
- _networkMgr.getNetworkRate(network.getId(), vm.getId()),
- _networkMgr.isSecurityGroupSupportedInNetwork(network),
- _networkMgr.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
+ _networkModel.getNetworkRate(network.getId(), vm.getId()),
+ _networkModel.isSecurityGroupSupportedInNetwork(network),
+ _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network));
//1) Unplug the nic
- NicTO nicTO = toNicTO(nicProfile, vmProfile.getVirtualMachine().getHypervisorType());
- s_logger.debug("Un-plugging nic for vm " + vm + " from network " + network);
- boolean result = vmGuru.unplugNic(network, nicTO, vmTO, context, dest);
- if (result) {
- s_logger.debug("Nic is unplugged successfully for vm " + vm + " in network " + network );
- } else {
- s_logger.warn("Failed to unplug nic for the vm " + vm + " from network " + network);
- return false;
+ if (vm.getState() == State.Running) {
+ NicTO nicTO = toNicTO(nicProfile, vmProfile.getVirtualMachine().getHypervisorType());
+ s_logger.debug("Un-plugging nic for vm " + vm + " from network " + network);
+ boolean result = vmGuru.unplugNic(network, nicTO, vmTO, context, dest);
+ if (result) {
+ s_logger.debug("Nic is unplugged successfully for vm " + vm + " in network " + network );
+ } else {
+ s_logger.warn("Failed to unplug nic for the vm " + vm + " from network " + network);
+ return false;
+ }
+ } else if (vm.getState() != State.Stopped) {
+ s_logger.warn("Unable to remove vm " + vm + " from network " + network);
+ throw new ResourceUnavailableException("Unable to remove vm " + vm + " from network, is not in the right state",
+ DataCenter.class, vm.getDataCenterIdToDeployIn());
}
//2) Release the nic