zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hyper-V replace config files with Service Settings

Browse source
This commit is contained in:
Alexander Trofimov 2015-05-28 07:24:29 +03:00
parent 60bc7505ca
commit 45bb3c53a8
12 changed files with 673 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs
View file

@ -165,12 +165,11 @@ namespace WebsitePanel.EnterpriseServer
{
// load service settings
StringDictionary settings = ServerController.GetServiceSettings(serviceId);
string path = settings["OsTemplatesPath"];
string xml = settings["OsTemplates"];
// get proxy
VirtualizationServer2012 vs = GetVirtualizationProxy(serviceId);
var config = new ConfigFile(xml);
return vs.GetLibraryItems(path);
return config.LibraryItems;
}
#endregion
@ -601,10 +600,7 @@ namespace WebsitePanel.EnterpriseServer
private static string GetCorrectTemplateFilePath(string templatesPath, string osTemplateFile)
{
if (osTemplateFile.Trim().EndsWith(".vhdx"))
return Path.Combine(templatesPath, osTemplateFile);
return Path.Combine(templatesPath, osTemplateFile + ".vhd");
return Path.Combine(templatesPath, osTemplateFile);
}
internal static void CreateVirtualMachineInternal(string taskId, VirtualMachine vm, LibraryItem osTemplate,
@ -2159,12 +2155,11 @@ namespace WebsitePanel.EnterpriseServer
// load service settings
StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
string path = settings["DvdLibraryPath"];
string xml = settings["DvdLibrary"];
// get proxy
VirtualizationServer2012 vs = GetVirtualizationProxy(vm.ServiceId);
var config = new ConfigFile(xml);
return vs.GetLibraryItems(path);
return config.LibraryItems;
}
public static ResultObject InsertDvdDisk(int itemId, string isoPath)