apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8094: forword port NetworkRulesSystemVmComman from 2.1.x to 2.2, to fix security group is lost after migration

Browse Source 
status 8094: resovled fixed

Conflicts:

	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
This commit is contained in:
Edison Su 2011-01-22 04:03:29 -05:00
parent 1bcbd983f1
commit 314a491b9c
4 changed files with 117 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -108,6 +108,7 @@ import com.cloud.agent.api.MigrateCommand;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.api.ModifyStoragePoolCommand;
import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PingCommand;
@ -168,6 +169,7 @@ import com.cloud.host.Host.Type;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.network.Networks.RouterPrivateIpStrategy;
import com.cloud.network.Networks.IsolationType;
import com.cloud.network.Networks.TrafficType;
import com.cloud.resource.ServerResource;
import com.cloud.resource.ServerResourceBase;
@ -865,6 +867,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return execute((CheckSshCommand) cmd);
} else if (cmd instanceof NetworkUsageCommand) {
return execute((NetworkUsageCommand) cmd);
} else if (cmd instanceof NetworkRulesSystemVmCommand) {
return execute((NetworkRulesSystemVmCommand)cmd);
} else {
s_logger.warn("Unsupported command ");
return Answer.createUnsupportedCommandAnswer(cmd);
@ -1724,6 +1728,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
_vms.put(cmd.getVmName(), State.Running);
}
}
return new CheckVirtualMachineAnswer(cmd, state, vncPort);
} catch (LibvirtException e) {
return new CheckVirtualMachineAnswer(cmd, e.getMessage());
@ -2224,7 +2229,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (vmSpec.getType() != VirtualMachine.Type.User) {
default_network_rules_for_systemvm(vmName);
} else {
default_network_rules(vmName, vmSpec.getNics()[0].getIp(), vmSpec.getId(), vmSpec.getNics()[0].getMac());
NicTO[] nics = vmSpec.getNics();
for (NicTO nic : nics) {
if (nic.getIsolationUri() != null && nic.getIsolationUri().getScheme().equalsIgnoreCase(IsolationType.Ec2.toString())) {
default_network_rules(vmName, vmSpec.getNics()[0].getIp(), vmSpec.getId(), vmSpec.getNics()[0].getMac());
}
}
}
// Attach each data volume to the VM, if there is a deferred attached disk
@ -3593,4 +3603,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
return storage;
}
private Answer execute(NetworkRulesSystemVmCommand cmd) {
boolean success = false;
if (cmd.getType() != VirtualMachine.Type.User) {
success = default_network_rules_for_systemvm(cmd.getVmName());
}
return new Answer(cmd, success, "");
}
}

69
core/src/com/cloud/agent/api/NetworkRulesSystemVmCommand.java Normal file
View File

@ -0,0 +1,69 @@
package com.cloud.agent.api;
import com.cloud.vm.VirtualMachine;
public class NetworkRulesSystemVmCommand extends Command {
/**
* Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
*
* This software is licensed under the GNU General Public License v3 or later.
*
* It is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
private String vmName;
private long vmId;
private String pubIp;
private String mac;
private VirtualMachine.Type type;
protected NetworkRulesSystemVmCommand() {
}
public NetworkRulesSystemVmCommand(String vmName, VirtualMachine.Type type) {
this.vmName = vmName;
}
public NetworkRulesSystemVmCommand(String vmName, long vmId, String publicIP, String mac, VirtualMachine.Type type) {
this.vmName = vmName;
this.vmId = vmId;
this.pubIp = publicIP;
this.mac = mac;
this.type = type;
}
public String getVmName() {
return vmName;
}
public long getVmId() {
return vmId;
}
public String getIp() {
return pubIp;
}
public String getMac() {
return mac;
}
public VirtualMachine.Type getType() {
return type;
}
@Override
public boolean executeInSequence() {
return false;
}
}

16
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -92,6 +92,7 @@ import com.cloud.agent.api.MigrateCommand;
import com.cloud.agent.api.ModifySshKeysCommand;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.api.ModifyStoragePoolCommand;
import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.PingCommand;
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
@ -441,6 +442,8 @@ public abstract class CitrixResourceBase implements ServerResource {
return execute((OvsDeleteFlowCommand)cmd);
} else if (cmd instanceof CleanupNetworkRulesCmd){
return execute((CleanupNetworkRulesCmd)cmd);
} else if (cmd instanceof NetworkRulesSystemVmCommand) {
return execute((NetworkRulesSystemVmCommand)cmd);
} else {
return Answer.createUnsupportedCommandAnswer(cmd);
}
@ -5664,4 +5667,17 @@ public abstract class CitrixResourceBase implements ServerResource {
protected String getGuestOsType(String stdType, boolean bootFromCD) {
return stdType;
}
private Answer execute(NetworkRulesSystemVmCommand cmd) {
boolean success = true;
Connection conn = getConnection();
if (cmd.getType() != VirtualMachine.Type.User) {
String result = callHostPlugin(conn, "vmops", "default_network_rules_systemvm", "vmName", cmd.getVmName());
if (result == null || result.isEmpty() || !Boolean.parseBoolean(result)) {
success = false;
}
}
return new Answer(cmd, success, "");
}
}

14
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -39,6 +39,7 @@ import com.cloud.agent.api.CheckVirtualMachineCommand;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.MigrateAnswer;
import com.cloud.agent.api.MigrateCommand;
import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.PrepareForMigrationAnswer;
import com.cloud.agent.api.PrepareForMigrationCommand;
import com.cloud.agent.api.StartAnswer;
@ -91,6 +92,7 @@ import com.cloud.user.AccountManager;
import com.cloud.user.User;
import com.cloud.user.dao.AccountDao;
import com.cloud.user.dao.UserDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Journal;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
@ -997,9 +999,17 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager {
if (!ma.getResult()) {
return null;
}
Commands cmds = new Commands(OnError.Revert);
CheckVirtualMachineCommand cvm = new CheckVirtualMachineCommand(vm.getInstanceName());
CheckVirtualMachineAnswer answer = (CheckVirtualMachineAnswer)_agentMgr.send(dstHostId, cvm);
cmds.addCommand(cvm);
if (vm.getType() != VirtualMachine.Type.User) {
NetworkRulesSystemVmCommand nrc = new NetworkRulesSystemVmCommand(vm.getInstanceName(), vm.getType());
cmds.addCommand(nrc);
}
_agentMgr.send(dstHostId, cmds);
CheckVirtualMachineAnswer answer = cmds.getAnswer(CheckVirtualMachineAnswer.class);
if (!answer.getResult()) {
s_logger.debug("Unable to complete migration for " + vm.toString());
stateTransitTo(vm, VirtualMachine.Event.AgentReportStopped, null);