Skip to content

Commit e68ff7e

Browse files
committed
xen: set Network.managed to true before creating the network
This should fix ``` 2025-04-07 12:08:20,472 WARN [c.c.h.x.r.w.x.CitrixStartCommandWrapper] (DirectAgent-36:[ctx-a59ea070]) (logid:97c16f84) Catch Exception: class com.xensource.xenapi.Types$NetworkUnmanaged due to The network is not managed by xapi. The network is not managed by xapi. at com.xensource.xenapi.Types.checkResponse(Types.java:2514) at com.xensource.xenapi.Connection.dispatch(Connection.java:266) at com.cloud.hypervisor.xenserver.resource.XenServerConnectionPool$XenServerConnection.dispatch(XenServerConnectionPool.java:458) at com.xensource.xenapi.VLAN.create(VLAN.java:363) at com.cloud.hypervisor.xenserver.resource.CitrixResourceBase.enableVlanNetwork(CitrixResourceBase.java:1736) at com.cloud.hypervisor.xenserver.resource.CitrixResourceBase.getNetwork(CitrixResourceBase.java:2885) at com.cloud.hypervisor.xenserver.resource.CitrixResourceBase.createVif(CitrixResourceBase.java:1280) at com.cloud.hypervisor.xenserver.resource.wrapper.xenbase.CitrixStartCommandWrapper.execute(CitrixStartCommandWrapper.java:106) at com.cloud.hypervisor.xenserver.resource.wrapper.xenbase.CitrixStartCommandWrapper.execute(CitrixStartCommandWrapper.java:56) at com.cloud.hypervisor.xenserver.resource.wrapper.xenbase.CitrixRequestWrapper.execute(CitrixRequestWrapper.java:122) at com.cloud.hypervisor.xenserver.resource.CitrixResourceBase.executeRequest(CitrixResourceBase.java:1791) ``` refer to CA-387821: SDK Tests/JavaSDK failed. Set Network.managed to true before creating the network. xenserver/xenserver-samples@1684db5
1 parent 778b1f9 commit e68ff7e

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,6 +1713,7 @@ protected Network enableVlanNetwork(final Connection conn, final long tag, final
17131713
nwr.nameLabel = newName;
17141714
nwr.tags = new HashSet<String>();
17151715
nwr.tags.add(generateTimeStamp());
1716+
nwr.managed = true;
17161717
vlanNetwork = Network.create(conn, nwr);
17171718
vlanNic = getNetworkByName(conn, newName);
17181719
if (vlanNic == null) { // Still vlanNic is null means we could not
@@ -2018,6 +2019,7 @@ public synchronized Network findOrCreateTunnelNetwork(final Connection conn, fin
20182019
// started
20192020
otherConfig.put("assume_network_is_shared", "true");
20202021
rec.otherConfig = otherConfig;
2022+
rec.managed = true;
20212023
nw = Network.create(conn, rec);
20222024
logger.debug("### XenServer network for tunnels created:" + nwName);
20232025
} else {
@@ -4882,6 +4884,7 @@ public void setupLinkLocalNetwork(final Connection conn) {
48824884
configs.put("netmask", NetUtils.getLinkLocalNetMask());
48834885
configs.put("vswitch-disable-in-band", "true");
48844886
rec.otherConfig = configs;
4887+
rec.managed = true;
48854888
linkLocal = Network.create(conn, rec);
48864889
} else {
48874890
linkLocal = networks.iterator().next();
@@ -5073,6 +5076,7 @@ public synchronized Network setupvSwitchNetwork(final Connection conn) {
50735076
if (networks.size() == 0) {
50745077
rec.nameDescription = "vswitch network for " + nwName;
50755078
rec.nameLabel = nwName;
5079+
rec.managed = true;
50765080
vswitchNw = Network.create(conn, rec);
50775081
} else {
50785082
vswitchNw = networks.iterator().next();

0 commit comments

Comments
 (0)