You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/08/18 07:44:56 UTC
[cloudstack] branch main updated: kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new f23a4db6d26 kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
f23a4db6d26 is described below
commit f23a4db6d2658781519c8820b03a2ad153df1024
Author: Marcus Sorensen <sh...@gmail.com>
AuthorDate: Thu Aug 18 01:44:50 2022 -0600
kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
This PR provides constructors and the associated changes to use LibvirtVMDef for creating user mode network interfaces.
While this isn't used directly in the CloudStack KVM agent today, it could be used in the future for e.g. pod networking/management networks without needing to assign a pod IP. The VIF driver used by the CloudStack Agent is also pluggable, so this allows plugin code to create user mode network interfaces as well.
Note that the user mode network already exists in the GuestNetType enum, but wasn't usable prior to this change.
Also included unit test to ensure we continue to create the expected XML.
Additionally, this uncovered a null pointer on _networkRateKBps and this PR fixes it. The decision to add bandwidth throttling assumes this field is not null and simply checks for > 0.
Signed-off-by: Marcus Sorensen <ml...@apple.com>
Co-authored-by: Marcus Sorensen <ml...@apple.com>
---
.../hypervisor/kvm/resource/LibvirtVMDef.java | 26 +++++++++++++++++--
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 29 +++++++++++++++++++++-
2 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 7c65f7970ad..b516ecc2c29 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -1188,7 +1188,7 @@ public class LibvirtVMDef {
private String _ipAddr;
private String _scriptPath;
private NicModel _model;
- private Integer _networkRateKBps;
+ private int _networkRateKBps;
private String _virtualPortType;
private String _virtualPortInterfaceId;
private int _vlanTag = -1;
@@ -1199,11 +1199,27 @@ public class LibvirtVMDef {
private String _dpdkSourcePort;
private String _dpdkExtraLines;
private String _interfaceMode;
+ private String _userIp4Network;
+ private Integer _userIp4Prefix;
public void defBridgeNet(String brName, String targetBrName, String macAddr, NicModel model) {
defBridgeNet(brName, targetBrName, macAddr, model, 0);
}
+ public void defUserNet(NicModel model, String macAddr, String ip4Network, Integer ip4Prefix) {
+ _netType = GuestNetType.USER;
+ _macAddr = macAddr;
+ _userIp4Network = ip4Network;
+ _userIp4Prefix = ip4Prefix;
+ _model = model;
+ }
+
+ public void defUserNet(NicModel model, String macAddr) {
+ _netType = GuestNetType.USER;
+ _macAddr = macAddr;
+ _model = model;
+ }
+
public void defBridgeNet(String brName, String targetBrName, String macAddr, NicModel model, Integer networkRateKBps) {
_netType = GuestNetType.BRIDGE;
_sourceName = brName;
@@ -1385,6 +1401,7 @@ public class LibvirtVMDef {
netBuilder.append("<source type='unix' path='"+ _dpdkSourcePath + _dpdkSourcePort +
"' mode='" + _interfaceMode + "'/>\n");
}
+
if (_networkName != null) {
netBuilder.append("<target dev='" + _networkName + "'/>\n");
}
@@ -1421,13 +1438,18 @@ public class LibvirtVMDef {
netBuilder.append(_dpdkExtraLines);
}
- if (_netType != GuestNetType.VHOSTUSER) {
+ if (_netType != GuestNetType.VHOSTUSER && _netType != GuestNetType.USER) {
netBuilder.append("<link state='" + (_linkStateUp ? "up" : "down") +"'/>\n");
}
if (_slot != null) {
netBuilder.append(String.format("<address type='pci' domain='0x0000' bus='0x00' slot='0x%02x' function='0x0'/>\n", _slot));
}
+
+ if (StringUtils.isNotBlank(_userIp4Network) && _userIp4Prefix != null) {
+ netBuilder.append(String.format("<ip family='ipv4' address='%s' prefix='%s'/>\n", _userIp4Network, _userIp4Prefix));
+ }
+
return netBuilder.toString();
}
diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
index b0eaad4f269..dba26286d62 100644
--- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
+++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java
@@ -56,7 +56,34 @@ public class LibvirtVMDefTest extends TestCase {
}
@Test
- public void testInterfaceEtehrnet() {
+ public void testInterfaceTypeUserWithNetwork() {
+ LibvirtVMDef.InterfaceDef interfaceDef = new LibvirtVMDef.InterfaceDef();
+ interfaceDef.defUserNet(LibvirtVMDef.InterfaceDef.NicModel.VIRTIO, "00:11:22:aa:bb:dd", "192.168.100.0", 24);
+
+ String expected = "<interface type='user'>\n" +
+ "<mac address='00:11:22:aa:bb:dd'/>\n" +
+ "<model type='virtio'/>\n" +
+ "<ip family='ipv4' address='192.168.100.0' prefix='24'/>\n" +
+ "</interface>\n";
+
+ assertEquals(expected, interfaceDef.toString());
+ }
+
+ @Test
+ public void testInterfaceTypeUserWithoutNetwork() {
+ LibvirtVMDef.InterfaceDef interfaceDef = new LibvirtVMDef.InterfaceDef();
+ interfaceDef.defUserNet(LibvirtVMDef.InterfaceDef.NicModel.VIRTIO, "00:11:22:aa:bb:dd");
+
+ String expected = "<interface type='user'>\n" +
+ "<mac address='00:11:22:aa:bb:dd'/>\n" +
+ "<model type='virtio'/>\n" +
+ "</interface>\n";
+
+ assertEquals(expected, interfaceDef.toString());
+ }
+
+ @Test
+ public void testInterfaceEthernet() {
LibvirtVMDef.InterfaceDef ifDef = new LibvirtVMDef.InterfaceDef();
ifDef.defEthernet("targetDeviceName", "00:11:22:aa:bb:dd", LibvirtVMDef.InterfaceDef.NicModel.VIRTIO);