Merge pull request #8 from ehrnst/dev

Dev

Author: ehrnst

README.md

@@ -43,7 +43,7 @@ Bringing SCOM in to the 21. century with a Restful Web API.
 | ------ | ------ |
 | [POST] API/ComputerMaintenance | Put the specific computer object and all child in maintenance mode |
 | [POST] API/ObjectMaintenance | Put the specific monitoring object and all child in maintenance mode |
-| [POST] API/MaintenanceSchedule | Create a new maintenance schedule. SCOM 2016 ONLY |
+| [POST] API/MaintenanceSchedule | Create a new maintenance schedule. Supports multiple object guids in an array. SCOM 2016 ONLY |
 
 ### Object
 

SCOM API/Controllers/SCOMMaintenanceController.cs

@@ -7,14 +7,15 @@
 using Microsoft.EnterpriseManagement;
 using Microsoft.EnterpriseManagement.Common;
 using Microsoft.EnterpriseManagement.Monitoring;
-using Microsoft.EnterpriseManagement.Monitoring.MaintenanceSchedule;
 using System.Web;
+using Microsoft.SystemCenter.OperationsManagerV10.Commands;
 using Microsoft.EnterpriseManagement.Configuration;
 using Newtonsoft.Json;
 using System.Collections.ObjectModel;
 using SCOM_API.Models;
 using System.Configuration;
 using System.Web.Http.Description;
+using Microsoft.EnterpriseManagement.Monitoring.MaintenanceSchedule;
 
 namespace SCOM_API.Controllers
 {
@@ -55,7 +56,7 @@ public IHttpActionResult EnableComputerMaintenance(SCOMComputerMaintenanceModel
             IList<ManagementPackClass> monClasses = mg.EntityTypes.GetClasses(classCriteria);
             MonitoringObjectCriteria criteria = new MonitoringObjectCriteria(string.Format("Name = '{0}'", Data.DisplayName.ToString()), monClasses[0]);
             List<MonitoringObject> monObjects = new List<MonitoringObject>();
-            
+
             List<SCOMComputerMaintenanceModel> MaintenanceComputers = new List<SCOMComputerMaintenanceModel>();
 
             ///travers trough all classes to get monitoring objects
@@ -83,7 +84,7 @@ public IHttpActionResult EnableComputerMaintenance(SCOMComputerMaintenanceModel
                         maintenanceComputer.EndTime = schedEndTime;
                         maintenanceComputer.Minutes = Data.Minutes;
                         maintenanceComputer.comment = comment;
-                        
+
                         //add computers to list
                         MaintenanceComputers.Add(maintenanceComputer);
 
@@ -131,6 +132,14 @@ public IHttpActionResult EnableComputerMaintenance(SCOMComputerMaintenanceModel
         [Route("API/ObjectMaintenance")]
         public IHttpActionResult EnableObjectMaintenance(SCOMObjectMaintenanceModel Data)
         {
+            //Validate input
+            if (!ModelState.IsValid)
+            {
+                HttpResponseMessage message = new HttpResponseMessage(HttpStatusCode.BadRequest);
+                message.Content = new StringContent("Missing a required parameter?");
+                throw new HttpResponseException(message);
+            }
+
             //create a Guid from the json input
             var ObjectId = new Guid(Data.id);
             //get the monitoring object by Guid
@@ -140,41 +149,41 @@ public IHttpActionResult EnableObjectMaintenance(SCOMObjectMaintenanceModel Data
 
             List<SCOMObjectMaintenanceModel> MaintenanceObjects = new List<SCOMObjectMaintenanceModel>();
 
-                if (!monObject.InMaintenanceMode)
+            if (!monObject.InMaintenanceMode)
+            {
                 {
-                    {
-                        //set maintenance properties
-                        DateTime startTime = DateTime.UtcNow;
-                        DateTime schedEndTime = DateTime.UtcNow.AddMinutes(Data.Minutes);
-                        MaintenanceModeReason reason = MaintenanceModeReason.PlannedOther;
-                        string comment = Data.comment;
+                    //set maintenance properties
+                    DateTime startTime = DateTime.UtcNow;
+                    DateTime schedEndTime = DateTime.UtcNow.AddMinutes(Data.Minutes);
+                    MaintenanceModeReason reason = MaintenanceModeReason.PlannedOther;
+                    string comment = Data.comment;
 
-                        monObject.ScheduleMaintenanceMode(startTime, schedEndTime, reason, comment);
+                    monObject.ScheduleMaintenanceMode(startTime, schedEndTime, reason, comment);
 
-                        //Add properties to list
-                        SCOMObjectMaintenanceModel maintenanceObject = new SCOMObjectMaintenanceModel();
-                        maintenanceObject.displayName = monObject.DisplayName;
-                        maintenanceObject.id = monObject.Id.ToString();
-                        maintenanceObject.EndTime = schedEndTime;
-                        maintenanceObject.Minutes = Data.Minutes;
-                        maintenanceObject.comment = comment;
+                    //Add properties to list
+                    SCOMObjectMaintenanceModel maintenanceObject = new SCOMObjectMaintenanceModel();
+                    maintenanceObject.displayName = monObject.DisplayName;
+                    maintenanceObject.id = monObject.Id.ToString();
+                    maintenanceObject.EndTime = schedEndTime;
+                    maintenanceObject.Minutes = Data.Minutes;
+                    maintenanceObject.comment = comment;
 
-                        //add computers to list
-                        MaintenanceObjects.Add(maintenanceObject);
+                    //add computers to list
+                    MaintenanceObjects.Add(maintenanceObject);
 
-                    }
                 }
+            }
 
-                //If object already in maintenance. Throw conflict message
-                else
-                {
-                    MaintenanceWindow MaintenanceWindow = monObject.GetMaintenanceWindow();
+            //If object already in maintenance. Throw conflict message
+            else
+            {
+                MaintenanceWindow MaintenanceWindow = monObject.GetMaintenanceWindow();
 
-                    HttpResponseMessage message = new HttpResponseMessage(HttpStatusCode.Conflict);
-                    message.Content = new StringContent("Object already in maintenance until" + MaintenanceWindow.ScheduledEndTime);
-                    throw new HttpResponseException(message);
+                HttpResponseMessage message = new HttpResponseMessage(HttpStatusCode.Conflict);
+                message.Content = new StringContent("Object already in maintenance until" + MaintenanceWindow.ScheduledEndTime);
+                throw new HttpResponseException(message);
 
-                }
+            }
 
             //Return list of computers as Json
             return Json(MaintenanceObjects);
@@ -188,15 +197,16 @@ public IHttpActionResult EnableObjectMaintenance(SCOMObjectMaintenanceModel Data
         /// <example>
         /// {
         ///     "scheduleName": "string",
-        ///     "id": "monitoringObjectId",
+        ///     "id": "[monitoringObjectId]",
         ///     "StartTime": "2017-05-22T07:01:00.374Z",
         ///     "EndTime": "2017-05-22T08:01:00.374Z",
         ///     "comment": "doing maintenance"
         /// }
         /// </example>
         /// <remarks>
         /// ##SCOM 2016 Only##
-        /// Only non recurring schedules with one object is supported. Maintenance reason is hard coded to 'PlannedOther'
+        /// Only non recurring schedules are supported. Maintenance reason will be hard coded to 'PlannedOther'
+        /// Use the other endpoints to obtain your MonitoringObjectId
         /// </remarks>
         /// <response code="201">Successfully added maintenance mode for the object</response>
         /// <response code="400">Bad request. Check json input</response>
@@ -206,15 +216,24 @@ public IHttpActionResult EnableObjectMaintenance(SCOMObjectMaintenanceModel Data
         [Route("API/MaintenanceSchedule")]
         public IHttpActionResult ScheduleObjectMaintenance(SCOMObjectSchedMaintenanceModel Data)
         {
-            
-            //create a Guid from the json input
-            var ObjectId = new Guid(Data.id);
-            //get the monitoring object by Guid
-            var monObject = mg.EntityObjects.GetObject<MonitoringObject>(ObjectId, ObjectQueryOptions.Default);
+            //Validate post
+            if (!ModelState.IsValid)
+            {
+                HttpResponseMessage message = new HttpResponseMessage(HttpStatusCode.BadRequest);
+                message.Content = new StringContent("Missing a required parameter?");
+                throw new HttpResponseException(message);
+            }
+
+            //LOOP through the id array and add each GUID to the object list
             System.Collections.Generic.List<System.Guid> ObjectList = new System.Collections.Generic.List<System.Guid>();
+            string[] array = Data.id;
+            foreach (string s in array)
+            {
+                var item = new Guid(s);
 
-            //add the monitoring object guids to list
-            ObjectList.Add(monObject.Id);
+                ObjectList.Add(item);
+            }
+            //
 
             //create a recurrencePattern this is 'sourced' from OmCommands.10.dll ( new-scommaintenanceSchedule CMDLET )
             //read more: https://docs.microsoft.com/en-us/powershell/systemcenter/systemcenter2016/operationsmanager/vlatest/new-scommaintenanceschedule
@@ -235,27 +254,26 @@ public IHttpActionResult ScheduleObjectMaintenance(SCOMObjectSchedMaintenanceMod
             int duration = (int)span.TotalMinutes;
 
             //Create the Maintenance schedule
-            MaintenanceSchedule Sched = new MaintenanceSchedule(mg, displayname, recursive, isEnabled, ObjectList, duration, activeStartTime, activeEndDate, MaintenanceModeReason.PlannedOther, comments, isRecurrence, recurrencePattern );
-
+            MaintenanceSchedule Sched = new MaintenanceSchedule(mg, displayname, recursive, isEnabled, ObjectList, duration, activeStartTime, activeEndDate, MaintenanceModeReason.PlannedOther, comments, isRecurrence, recurrencePattern);
 
             //Create the maintenance schedule
             System.Guid guid = MaintenanceSchedule.CreateMaintenanceSchedule(Sched, mg);
 
-            //Add properties to class and return the list as Json
+            //Add properties to class
             var shed = MaintenanceSchedule.GetMaintenanceScheduleById(guid, mg);
             List<SCOMObjectSchedMaintenanceModel> MaintenanceScheduleList = new List<SCOMObjectSchedMaintenanceModel>();
-            SCOMObjectSchedMaintenanceModel mSched = new SCOMObjectSchedMaintenanceModel ();
-            mSched.id = shed.ScheduleId.ToString();
+            SCOMObjectSchedMaintenanceModel mSched = new SCOMObjectSchedMaintenanceModel();
+            mSched.id = array;
             mSched.StartTime = shed.ActiveStartTime;
             mSched.EndTime = shed.ScheduledEndTime;
             mSched.scheduleName = shed.ScheduleName;
             mSched.comment = shed.Comments;
 
             MaintenanceScheduleList.Add(mSched);
-
+            //return the post/class as Json
             return Json(MaintenanceScheduleList);
 
-            
+
         }
 
     }

SCOM API/Models/MaintenanceScheduleModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web;
 
@@ -10,12 +11,14 @@ public class SCOMObjectMaintenanceModel
         /// <summary>
         /// Monitoring object id
         /// </summary>
+        [Required]
         public string id { get; set; }
 
         public string displayName { get; set; }
         /// <summary>
         /// Minutes to maintenance
         /// </summary>
+        [Required]
         public int Minutes { get; set; }
 
         public DateTime EndTime { get; set; }

SCOM API/Models/SCOMObjectMaintenanceModel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Web;
 
@@ -10,19 +11,24 @@ public class SCOMObjectSchedMaintenanceModel
         /// <summary>
         /// Name of the maintenance schedule
         /// </summary>
+        [Required]
         public string scheduleName { get; set; }
+        [Required]
         /// <summary>
-        /// Monitoring object ID
+        /// Monitoring object ID(s)
         /// </summary>
-        public string id { get; set; }
+        public string[] id { get; set; }
+        [Required]
         /// <summary>
         /// Start time and date
         /// </summary>
         public DateTime StartTime { get; set; }
+        [Required]
         /// <summary>
         /// End time and date
         /// </summary>
         public DateTime EndTime { get; set; }
+        [Required]
         /// <summary>
         /// Comment
         /// </summary>

SCOM API/Models/SCOMObjectScheduleMaintenanceModel.cs

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <SiteUrlToLaunchAfterPublish />
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>C:\temp\scomapi\test</publishUrl>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+  </PropertyGroup>
+</Project>

SCOM API/Properties/PublishProfiles/web.pubxml

@@ -120,15 +120,15 @@
     </Reference>
     <Reference Include="Microsoft.EnterpriseManagement.Core, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>\\i2v-scom16t-001\c$\Program Files\Microsoft System Center 2016\Operations Manager\Server\SDK Binaries\Microsoft.EnterpriseManagement.Core.dll</HintPath>
+      <HintPath>\\distr\users\aa98\PUBLIC\Microsoft.EnterpriseManagement.Core.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EnterpriseManagement.OperationsManager, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>\\i2v-scom16t-001\c$\Program Files\Microsoft System Center 2016\Operations Manager\Server\SDK Binaries\Microsoft.EnterpriseManagement.OperationsManager.dll</HintPath>
+      <HintPath>\\distr\users\aa98\PUBLIC\Microsoft.EnterpriseManagement.OperationsManager.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EnterpriseManagement.Runtime, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>\\i2v-scom16t-001\c$\Program Files\Microsoft System Center 2016\Operations Manager\Server\SDK Binaries\Microsoft.EnterpriseManagement.Runtime.dll</HintPath>
+      <HintPath>\\distr\users\aa98\PUBLIC\Microsoft.EnterpriseManagement.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
@@ -273,7 +273,6 @@
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
-    <Compile Include="Models\MaintenanceScheduleModel.cs" />
     <Compile Include="Models\SCOMComputerModelDetailed.cs" />
     <Compile Include="Models\SCOMObjectScheduleMaintenanceModel.cs" />
     <Compile Include="Models\SCOMObjectMaintenanceModel.cs" />
@@ -284,6 +283,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
+    <None Include="Properties\PublishProfiles\web.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -293,7 +293,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />