Merge pull request #249 from sharwell/fix-176

Return an empty collection of IP addresses if a server is not connected to a specific network

Author: sharwell

src/corelib/Providers/Rackspace/CloudServersProvider.cs

@@ -445,11 +445,49 @@ public IEnumerable<IPAddress> ListAddressesByNetwork(string serverId, string net
 
             var urlPath = new Uri(string.Format("{0}/servers/{1}/ips/{2}", GetServiceEndpoint(identity, region), serverId, network));
 
-            var response = ExecuteRESTRequest<ServerAddresses>(identity, urlPath, HttpMethod.GET);
-            if (response == null || response.Data == null)
-                return null;
+            try
+            {
+                var response = ExecuteRESTRequest<ServerAddresses>(identity, urlPath, HttpMethod.GET);
+                if (response == null || response.Data == null)
+                    return null;
 
-            return response.Data[network];
+                return response.Data[network];
+            }
+            catch (ItemNotFoundException)
+            {
+                // if the specified server and network exist separately, then the 404 was only caused by server
+                // not being connected to the particular network
+                // https://github.com/openstacknetsdk/openstack.net/issues/176
+                bool foundServer = false;
+                try
+                {
+                    Server details = GetDetails(serverId);
+                    foundServer = details != null;
+                }
+                catch (ResponseException)
+                {
+                }
+
+                if (!foundServer)
+                    throw;
+
+                bool foundNetwork = false;
+                try
+                {
+                    INetworksProvider networksProvider = new CloudNetworksProvider(DefaultIdentity, DefaultRegion, IdentityProvider, RestService);
+                    IEnumerable<CloudNetwork> networks = networksProvider.ListNetworks(region, identity);
+                    if (networks != null && networks.Any(i => network.Equals(i.Label, StringComparison.OrdinalIgnoreCase)))
+                        foundNetwork = true;
+                }
+                catch (ResponseException)
+                {
+                }
+
+                if (!foundNetwork)
+                    throw;
+
+                return Enumerable.Empty<IPAddress>();
+            }
         }
 
         #endregion

src/testing/integration/Providers/Rackspace/UserServerTests.cs

@@ -278,19 +278,17 @@ public void TestListAddressesByNetwork()
             foreach (CloudNetwork network in networks)
             {
                 Console.WriteLine("Network: {0}", network.Label);
-                try
+                IEnumerable<IPAddress> addresses = provider.ListAddressesByNetwork(_server.Id, network.Label);
+                bool foundAddressOnNetwork = false;
+                foreach (IPAddress address in addresses)
                 {
-                    IEnumerable<IPAddress> addresses = provider.ListAddressesByNetwork(_server.Id, network.Label);
-                    foreach (IPAddress address in addresses)
-                    {
-                        foundAddress = true;
-                        Console.WriteLine("  {0}", address);
-                    }
+                    foundAddress = true;
+                    foundAddressOnNetwork = true;
+                    Console.WriteLine("  {0}", address);
                 }
-                catch (ItemNotFoundException)
-                {
+
+                if (!foundAddressOnNetwork)
                     Console.WriteLine("  Server is not attached to this network.");
-                }
             }
 
             if (!foundAddress)