etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CS-15660 : fixed

This commit is contained in:
anthony 2012-07-23 14:07:36 -07:00
parent d23a829c2e
commit 13b7c8b810
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,12 +567,11 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
return new XsLocalNetwork(Network.getByUuid(conn, _host.privateNetwork), null, PIF.getByUuid(conn, _host.privatePif), null);
} else if (type == TrafficType.Public) {
return new XsLocalNetwork(Network.getByUuid(conn, _host.publicNetwork), null, PIF.getByUuid(conn, _host.publicPif), null);
}
/* TrafficType.Storage is for secondary storage, while storageNetwork1 is for primary storage, we need better name here
else if (type == TrafficType.Storage) {
} else if (type == TrafficType.Storage) {
/* TrafficType.Storage is for secondary storage, while storageNetwork1 is for primary storage, we need better name here */
return new XsLocalNetwork(Network.getByUuid(conn, _host.storageNetwork1), null, PIF.getByUuid(conn, _host.storagePif1), null);
}
*/
throw new CloudRuntimeException("Unsupported network type: " + type);
}
@ -4277,13 +4276,13 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
}
_host.publicPif = publicNic.getPifRecord(conn).uuid;
_host.publicNetwork = publicNic.getNetworkRecord(conn).uuid;
XsLocalNetwork storageNic1 = null;
if (_storageNetworkName1 != null ) {
storageNic1 = getNetworkByName(conn, _storageNetworkName1);
_host.storageNetwork1 = storageNic1.getNetworkRecord(conn).uuid;
_host.storagePif1 = storageNic1.getPifRecord(conn).uuid;
if (_storageNetworkName1 == null ) {
_storageNetworkName1 = _guestNetworkName;
}
XsLocalNetwork storageNic1 = null;
storageNic1 = getNetworkByName(conn, _storageNetworkName1);
_host.storageNetwork1 = storageNic1.getNetworkRecord(conn).uuid;
_host.storagePif1 = storageNic1.getPifRecord(conn).uuid;
XsLocalNetwork storageNic2 = null;
if (_storageNetworkName2 != null) {