Added NameServer object and using NameServer collections for domain:ns properties

Author: rkruisselbrink

EppLib/Entities/Domain/DomainBase.cs

@@ -25,13 +25,27 @@ protected DomainBase()
         {
         }
 
-        protected XmlNode CreateNameServerElement(XmlDocument doc, IEnumerable<string> nameServers)
+        protected XmlNode CreateNameServerElement(XmlDocument doc, IEnumerable<NameServer> nameServers, bool useHostAttr = false)
         {
             var nameServerElement = doc.CreateElement("domain:ns", namespaceUri);
 
             foreach (var serverName in nameServers)
             {
-                AddXmlElement(doc, nameServerElement, "domain:hostObj", serverName,namespaceUri);
+                if (useHostAttr)
+                {
+                    var hostAttr = AddXmlElement(doc, nameServerElement, "domain:hostAttr", "", namespaceUri);
+
+                    AddXmlElement(doc, nameServerElement, "domain:hostName", serverName.HostName, namespaceUri);
+
+                    foreach (var address in serverName.HostAddresses)
+                    {
+                        var hostAddr = AddXmlElement(doc, hostAttr, "domain:hostAddr", address.IPAddress, namespaceUri);
+
+                        hostAddr.SetAttribute("ip", address.IPVersion);
+                    }
+                }
+                else
+                    AddXmlElement(doc, nameServerElement, "domain:hostObj", serverName.HostName, namespaceUri);
             }
 
             return nameServerElement;

EppLib/Entities/Domain/DomainCreate.cs

@@ -19,7 +19,7 @@ namespace EppLib.Entities
 {
     public class DomainCreate : DomainBase<DomainCreateResponse>
     {
-        private readonly IList<string> nameServers = new List<string>();
+        private readonly IList<NameServer> nameServers = new List<NameServer>();
 
         private readonly IList<DomainContact> domainContacts = new List<DomainContact>();
 
@@ -29,7 +29,7 @@ public class DomainCreate : DomainBase<DomainCreateResponse>
 
         public string RegistrantContactId { get; set; }
 
-        public IList<string> NameServers
+        public IList<NameServer> NameServers
         {
             get { return nameServers; }
         }
@@ -58,9 +58,11 @@ protected override XmlElement BuildCommandElement(XmlDocument doc, XmlElement co
                 period.SetAttribute("unit", Period.Unit);
             }
 
-            if (NameServers != null && NameServers.Count>0)
+            if (NameServers != null && NameServers.Count > 0)
             {
-                domainCreate.AppendChild(CreateNameServerElement(doc, NameServers));
+                //TODO: Add option for hostObj way
+                //domainCreate.AppendChild(CreateNameServerElement(doc, NameServers));
+                domainCreate.AppendChild(CreateNameServerElement(doc, NameServers, true));
             }
 
             if (RegistrantContactId != null)
@@ -70,7 +72,7 @@ protected override XmlElement BuildCommandElement(XmlDocument doc, XmlElement co
 
             foreach (var contact in DomainContacts)
             {
-                var contact_element = AddXmlElement(doc, domainCreate, "domain:contact", contact.Id,namespaceUri);
+                var contact_element = AddXmlElement(doc, domainCreate, "domain:contact", contact.Id, namespaceUri);
 
                 contact_element.SetAttribute("type", contact.Type);
             }

EppLib/Entities/Domain/DomainUpdate.cs

@@ -54,10 +54,10 @@ protected override XmlElement BuildCommandElement(XmlDocument doc, XmlElement co
                 if (DomainChange.RegistrantContactId != null)
                 {
                     AddXmlElement(doc, change_element, "domain:registrant", DomainChange.RegistrantContactId, namespaceUri);
-                }
-
-                if (DomainChange.AuthInfo != null) {
-                    var authInfoElement = AddXmlElement (doc, change_element, "domain:authInfo", null, namespaceUri);
+                }
+
+                if (DomainChange.AuthInfo != null) {
+                    var authInfoElement = AddXmlElement (doc, change_element, "domain:authInfo", null, namespaceUri);
                     AddXmlElement (doc, authInfoElement, "domain:pw", DomainChange.AuthInfo, namespaceUri);
                 } 
                 else if (DomainChange.NullAuthInfo) 

EppLib/Entities/Domain/NameServer.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace EppLib.Entities
+{
+    public class NameServer
+    {
+        public string HostName { get; set; }
+
+        public IList<HostAddress> HostAddresses { get; }
+
+        public NameServer()
+        {
+            HostAddresses = new List<HostAddress>();
+        }
+
+        public NameServer(string hostname) : this()
+        {
+            HostName = hostname;
+        }
+
+        public NameServer(string hostname, HostAddress hostAddress) : this()
+        {
+            HostName = hostname;
+            HostAddresses.Add(hostAddress);
+        }
+    }
+}

EppLib/Entities/EppDomainUpdateAddRemove.cs

@@ -17,7 +17,7 @@ namespace EppLib.Entities
 {
     public class EppDomainUpdateAddRemove
     {
-        public IList<string> NameServers = new List<string>();
+        public IList<NameServer> NameServers = new List<NameServer>();
         public IList<DomainContact> DomainContacts = new List<DomainContact>();
         public IList<Status> Status = new List<Status>();
     }

EppLib/EppLib.csproj

@@ -12,6 +12,7 @@
     <Compile Include="Entities\Contact\ContactCheckResult.cs" />
     <Compile Include="Entities\Domain\DomainReleaseResponse.cs" />
     <Compile Include="Entities\Domain\DomainRelease.cs" />
+    <Compile Include="Entities\Domain\NameServer.cs" />
     <Compile Include="Extensions\Fury\FuryContactCreateExtension.cs" />
     <Compile Include="Extensions\Fury\FuryContactUpdateExtension .cs" />
     <Compile Include="Extensions\Fury\FuryDomainCreateExtension.cs" />