From aace21ae5a9d4749c7300a619c96db2ce65e2d11 Mon Sep 17 00:00:00 2001 From: Sudarshan Acharya Date: Wed, 30 May 2012 15:34:44 -0500 Subject: [PATCH] Dns bug fixes related to usernet ip. --- reddwarf/dns/manager.py | 4 +++- reddwarf/instance/views.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/reddwarf/dns/manager.py b/reddwarf/dns/manager.py index a7ee42fde1..b8f9cb5393 100644 --- a/reddwarf/dns/manager.py +++ b/reddwarf/dns/manager.py @@ -52,10 +52,12 @@ class DnsManager(object): """ entry = self.entry_factory.create_entry(instance_id) - LOG.debug("Creating entry address %s." % str(entry)) if entry: entry.content = content[0] + LOG.debug("Creating entry address %s." % str(entry)) self.driver.create_entry(entry) + else: + LOG.debug("Entry address not found for instance %s" % instance_id) def delete_instance_entry(self, instance_id, content=None): """Removes a DNS entry associated to an instance. diff --git a/reddwarf/instance/views.py b/reddwarf/instance/views.py index aa0bad1c65..2d4de1dfdb 100644 --- a/reddwarf/instance/views.py +++ b/reddwarf/instance/views.py @@ -27,6 +27,10 @@ def get_ip_address(addresses): addresses.get('private') is not None and \ len(addresses['private']) > 0: return [addr.get('addr') for addr in addresses['private']] + if addresses is not None and\ + addresses.get('usernet') is not None and\ + len(addresses['usernet']) > 0: + return [addr.get('addr') for addr in addresses['usernet']] def get_volumes(volumes):