Changeset 8958 for branches/OaaS/HeuristicLab.Services.Optimization.Controller

Timestamp:

11/28/12 10:02:01 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Added a administrator web interface for job management
• Fixed Hive Client (PluginValidator) to find the assemblies within the right directories
• Reorganized controller classes (Folders HL, Interfaces, Azure)
• You may now successfully schedule and run jobs with the web ui.

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Controller

Files:

• Azure (added)
• Azure/DAL.cs (added)
• HL (added)
• HL/HLMapper.cs (added)
• HL/HiveMapper.cs (added)
• HL/HiveScenarioManager.cs (added)
• HL/HiveScenarioManagerOld.cs (added)
• HL/ScenarioParser.cs (added)
• HLMapper.cs (deleted)
• HeuristicLab.Services.Optimization.ControllerService.csproj (modified) (3 diffs)
• HiveMapper.cs (deleted)
• HiveScenarioManager.cs (deleted)
• HiveScenarioManagerOld.cs (deleted)
• Interfaces/DAL.cs (added)
• Interfaces/IControllerService.cs (modified) (2 diffs)
• Interfaces/IScenarioManager.cs (modified) (1 diff)
• PlaceholderControllerService.cs (modified) (2 diffs)
• ScenarioParser.cs (deleted)

branches/OaaS/HeuristicLab.Services.Optimization.Controller/HeuristicLab.Services.Optimization.ControllerService.csproj

@@ -130 +130 @@
       <HintPath>..\bin\HeuristicLab.Tracing-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.CloudDrive, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.WindowsAzure.StorageClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.Services.Client" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -142 +148 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="HiveScenarioManagerOld.cs" />
-    <Compile Include="HiveMapper.cs" />
-    <Compile Include="HiveScenarioManager.cs" />
-    <Compile Include="HLMapper.cs" />
+    <Compile Include="Azure\DAL.cs" />
+    <Compile Include="HL\HiveScenarioManagerOld.cs" />
+    <Compile Include="HL\HiveMapper.cs" />
+    <Compile Include="HL\HiveScenarioManager.cs" />
+    <Compile Include="HL\HLMapper.cs" />
     <Compile Include="Interfaces\IControllerService.cs" />
+    <Compile Include="Interfaces\DAL.cs" />
     <Compile Include="Interfaces\IScenarioManager.cs" />
     <Compile Include="Model\ControllerModel.cs" />
     <Compile Include="PlaceholderControllerService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ScenarioParser.cs" />
+    <Compile Include="HL\ScenarioParser.cs" />
     <Compile Include="Utility.cs" />
   </ItemGroup>
@@ -157 +165 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IControllerService.cs

@@ -12 +12 @@
     [OperationContract]
     IEnumerable<OptimizationScenario> GetOptimizationScenarios();
+
+    [OperationContract]
+    IEnumerable<string> GetOptimizationScenarioNames();
 
     [OperationContract]
@@ -30 +33 @@
     [OperationContract]
     IList<Model.Run> GetJobResults(User user, string id);
+
+    [OperationContract]
+    bool AddHiveScenario(User user, string scenarioXml, string scenarioMapper);
+
+    [OperationContract]
+    bool DeleteHiveScenario(User user, string scenarioName);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/Interfaces/IScenarioManager.cs

@@ -12 +12 @@
     void DeleteJob(User user, string id);
     IList<Model.Run> GetJobResults(User user, string id);
+    bool AddScenario(User user, string scenarioName, string scenarioXml, string scenarioMapper);
+    bool DeleteScenario(User user, string scenarioName);
   }
 }

branches/OaaS/HeuristicLab.Services.Optimization.Controller/PlaceholderControllerService.cs

@@ -62 +62 @@
 
     public Model.OptimizationScenario GetOptimizationScenarioByName(string name) {
-      if (scenarios[0].Name == name)
-        return scenarios[0];
-      return null;
+      var scen = (from e in scenarios
+                  where e.Name == name
+                  select e).FirstOrDefault();      
+      return scen;
     }
 
@@ -89 +90 @@
       return hiveManager.GetJobResults(user, id);
     }
+
+
+    public bool AddHiveScenario(User user, string scenarioXml, string scenarioMapper) {
+      var scenario = parser.ParseScenarioFromXml(scenarioXml);
+      if (scenario == null) {
+        return false;
+      }      
+      var added = hiveManager.AddScenario(user, scenario.Name, scenarioXml, scenarioMapper);
+      if (added) 
+        scenarios.Add(scenario);
+      return added;
+    }
+
+    public bool DeleteHiveScenario(User user, string scenarioName) {
+      var scen = GetOptimizationScenarioByName(scenarioName);
+      if (scen != null) {
+        scenarios.Remove(scen);
+        return hiveManager.DeleteScenario(user, scenarioName);
+      }
+      return false;
+    }
+
+    public IEnumerable<string> GetOptimizationScenarioNames() {
+      return (from e in scenarios
+              select e.Name).AsEnumerable();      
+    }
   }
 }