From a96449433240e50da122481679ea5d6770c611e8 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 8 Jan 2011 17:31:00 -0800 Subject: [PATCH] bug 7722: open vswitch - align some data type with master branch --- build/replace.properties | 1 - .../com/cloud/agent/api/PingRoutingWithOvsCommand.java | 2 +- scripts/vm/hypervisor/xenserver/vmops | 10 ++++------ server/src/com/cloud/configuration/Config.java | 2 +- .../src/com/cloud/network/ovs/OvsNetworkManager.java | 6 +----- .../com/cloud/network/ovs/OvsNetworkManagerImpl.java | 8 +------- .../router/VirtualNetworkApplianceManagerImpl.java | 1 + 7 files changed, 9 insertions(+), 21 deletions(-) diff --git a/build/replace.properties b/build/replace.properties index 61200f70217..0b6b60c363f 100644 --- a/build/replace.properties +++ b/build/replace.properties @@ -6,4 +6,3 @@ DBHOST=localhost AGENTLOGDIR=logs AGENTLOG=logs/agent.log MSMNTDIR=/mnt -DBROOTPW= diff --git a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java index c52efe1a2ca..0912a926e3a 100644 --- a/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java +++ b/core/src/com/cloud/agent/api/PingRoutingWithOvsCommand.java @@ -5,7 +5,7 @@ import java.util.Map; import com.cloud.host.Host; import com.cloud.utils.Pair; -import com.cloud.vm.State; +import com.cloud.vm.VirtualMachine.State; public class PingRoutingWithOvsCommand extends PingRoutingCommand { List> states; diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 2781fa081ad..1a13c40eff5 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -657,21 +657,17 @@ def ovs_handle_rebooted_vm(session, vmName): ofports = ovs_get_ofports_info_from_log(vmName) ovs_write_vm_log(bridge, vmName, curr_domid, seqno, nics, macs, tag, vlanstr, ofports) - #see if there is rebooted vm to handle - ovs_get_vm_log(session, {"host_uuid":hostuuid}) return True @echo def ovs_get_vm_log(session, args): host_uuid = args.pop('host_uuid') try: - session = get_xapi_session() - thishost = session.xenapi.host.get_by_uuid(host_uuid) hostrec = session.xenapi.host.get_record(thishost) vms = hostrec.get('resident_VMs') - except: - util.SMlog("Failed to get host from uuid " + host_uuid) + except Exception, e: + util.SMlog("Failed to get host from uuid %s, exception: %s" % (host_uuid, e.__str__())) return ' ' result = [] @@ -800,6 +796,8 @@ def ovs_set_tag_and_flow(session, args): if res == 'false': return 'CREATE_LOG_FAILED' + #see if there is rebooted vm to handle + ovs_get_vm_log(session, {"host_uuid":hostuuid}) return 'SUCCESS' @echo diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 603b528dbf5..7e14f81c86a 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -60,7 +60,7 @@ public enum Config { NetworkThrottlingRate("Network", ManagementServer.class, Integer.class, "network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed.", null), GuestDomainSuffix("Network", AgentManager.class, String.class, "guest.domain.suffix", "cloud-test.cloud.internal", "Default domain name for vms inside virtualized networks fronted by router", null), DirectNetworkNoDefaultRoute("Network", ManagementServer.class, Boolean.class, "direct.network.no.default.route", "false", "Direct Network Dhcp Server should not send a default route", "true/false"), - OvsNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.network", "true", "enable/disable open vswitch network", null), + OvsNetwork("Network", ManagementServer.class, Boolean.class, "open.vswitch.network", "false", "enable/disable open vswitch network", null), //VPN RemoteAccessVpnPskLength("Network", AgentManager.class, Integer.class, "remote.access.vpn.psk.length", "24", "The length of the ipsec preshared key (minimum 8, maximum 256)", null), diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManager.java b/server/src/com/cloud/network/ovs/OvsNetworkManager.java index 36eda23c639..dae467e77bb 100644 --- a/server/src/com/cloud/network/ovs/OvsNetworkManager.java +++ b/server/src/com/cloud/network/ovs/OvsNetworkManager.java @@ -5,16 +5,12 @@ import java.util.Set; import com.cloud.agent.manager.Commands; import com.cloud.deploy.DeployDestination; -import com.cloud.network.Network; -import com.cloud.resource.ServerResource; -import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.component.Manager; import com.cloud.vm.DomainRouterVO; -import com.cloud.vm.State; +import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; public interface OvsNetworkManager extends Manager { diff --git a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java index 7dd23eb6170..afbf7795f07 100644 --- a/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java +++ b/server/src/com/cloud/network/ovs/OvsNetworkManagerImpl.java @@ -23,10 +23,6 @@ import com.cloud.deploy.DeployDestination; import com.cloud.exception.AgentUnavailableException; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; -import com.cloud.network.Network; -import com.cloud.network.NetworkVO; -import com.cloud.network.Networks.BroadcastDomainType; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; import com.cloud.network.ovs.dao.OvsWorkDao; import com.cloud.network.ovs.dao.OvsWorkVO; @@ -39,7 +35,6 @@ import com.cloud.network.ovs.dao.VmFlowLogVO; import com.cloud.server.ManagementServer; import com.cloud.user.AccountVO; import com.cloud.user.dao.AccountDao; -import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.component.Inject; @@ -47,8 +42,7 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.vm.DomainRouterVO; -import com.cloud.vm.NicVO; -import com.cloud.vm.State; +import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index bc526b01746..e60617a2814 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -295,6 +295,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian RemoteAccessVpnDao _vpnDao; @Inject VMInstanceDao _instanceDao; + @Inject OvsNetworkManager _ovsNetworkMgr; long _routerTemplateId = -1;