Feature #42: Active Directory Interop Upgrade

AD Interop moved to Disco.Services; Supports multi-domain environments,
sites, and searching restricted with OUs.

Disco.Models/Interop/ActiveDirectory/ActiveDirectoryMachineAccount.cs

@@ -1,21 +1,23 @@
-using System;
+using Disco.Models.Repository;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Disco.Models.Repository;
 
 namespace Disco.Models.Interop.ActiveDirectory
 {
     public class ActiveDirectoryMachineAccount : IActiveDirectoryObject
     {
-        public string DistinguishedName { get; set; }
-        public string DnsName { get; set; }
+
         public string Domain { get; set; }
-        public string Name { get; set; }
-        public Guid NetbootGUID { get; set; }
-        public string SecurityIdentifier { get; set; }
-        public string Path { get; set; }
         public string SamAccountName { get; set; }
+
+        public string SecurityIdentifier { get; set; }
+        public string DistinguishedName { get; set; }
+        public string Path { get; set; }
+
+        public string Name { get; set; }
+        public string DnsName { get; set; }
+        public Guid NetbootGUID { get; set; }
+
         public bool IsCriticalSystemObject { get; set; }
         public Dictionary<string, object[]> LoadedProperties { get; set; }
 
@@ -23,10 +25,11 @@ namespace Disco.Models.Interop.ActiveDirectory
         {
             return new User
             {
-                Id = this.SamAccountName,
+                UserId = this.Domain + "\\" + this.SamAccountName,
                 DisplayName = this.Name
             };
         }
 
+        public string NetBiosId { get { return string.Format(@"{0}\{1}", Domain, SamAccountName); } }
     }
 }