summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>2011-01-12 11:26:22 +0900
committerHisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>2011-01-12 11:26:22 +0900
commit1629dcf935a29c01d4e4ad509e33356daa93b051 (patch)
tree69d0297312acf82ea03af12cd392477d82ba98d6
parentc14425541a1e77eb2049b94060bc0c4cd1df578f (diff)
Fixed for pep8
Remove temporary debugging
-rwxr-xr-xbin/nova-manage10
-rw-r--r--nova/db/api.py3
-rw-r--r--nova/db/sqlalchemy/api.py4
-rw-r--r--nova/utils.py1
4 files changed, 12 insertions, 6 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 04ecc8c10..7331186c7 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -91,6 +91,7 @@ flags.DECLARE('vlan_start', 'nova.network.manager')
flags.DECLARE('vpn_start', 'nova.network.manager')
flags.DECLARE('fixed_range_v6', 'nova.network.manager')
+
class VpnCommands(object):
"""Class for managing VPNs."""
@@ -432,11 +433,12 @@ class NetworkCommands(object):
"""Class for managing networks."""
def create(self, fixed_range=None, num_networks=None,
- network_size=None, vlan_start=None, vpn_start=None,fixed_range_v6=None):
+ network_size=None, vlan_start=None, vpn_start=None,
+ fixed_range_v6=None):
"""Creates fixed ips for host by range
arguments: [fixed_range=FLAG], [num_networks=FLAG],
[network_size=FLAG], [vlan_start=FLAG],
- [vpn_start=FLAG],[fixed_range_v6=FLAG]"""
+ [vpn_start=FLAG], [fixed_range_v6=FLAG]"""
if not fixed_range:
fixed_range = FLAGS.fixed_range
if not num_networks:
@@ -453,9 +455,7 @@ class NetworkCommands(object):
net_manager.create_networks(context.get_admin_context(),
fixed_range, int(num_networks),
int(network_size), int(vlan_start),
- int(vpn_start),fixed_range_v6)
-
-
+ int(vpn_start), fixed_range_v6)
class ServiceCommands(object):
diff --git a/nova/db/api.py b/nova/db/api.py
index 8684a3aef..03e800466 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -284,6 +284,7 @@ def fixed_ip_get_instance(context, address):
"""Get an instance for a fixed ip by address."""
return IMPL.fixed_ip_get_instance(context, address)
+
def fixed_ip_get_instance_v6(context, address):
return IMPL.fixed_ip_get_instance_v6(context, address)
@@ -345,6 +346,7 @@ def instance_get_fixed_address(context, instance_id):
"""Get the fixed ip address of an instance."""
return IMPL.instance_get_fixed_address(context, instance_id)
+
def instance_get_fixed_address_v6(context, instance_id):
return IMPL.instance_get_fixed_address_v6(context, instance_id)
@@ -543,6 +545,7 @@ def project_get_network(context, project_id, associate=True):
return IMPL.project_get_network(context, project_id)
+
def project_get_network_v6(context, project_id):
return IMPL.project_get_network_v6(context, project_id)
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index ffc0ec221..7c3afa4ad 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -585,6 +585,7 @@ def fixed_ip_get_instance(context, address):
fixed_ip_ref = fixed_ip_get_by_address(context, address)
return fixed_ip_ref.instance
+
@require_context
def fixed_ip_get_instance_v6(context, address):
session = get_session()
@@ -801,6 +802,7 @@ def instance_get_fixed_address(context, instance_id):
return None
return instance_ref.fixed_ip['address']
+
@require_context
def instance_get_fixed_address_v6(context, instance_id):
session = get_session()
@@ -811,6 +813,7 @@ def instance_get_fixed_address_v6(context, instance_id):
mac = instance_ref.mac_address
return utils.to_global_ipv6(prefix, mac)
+
@require_context
def instance_get_floating_address(context, instance_id):
session = get_session()
@@ -1150,6 +1153,7 @@ def project_get_network(context, project_id, associate=True):
first()
return result
+
@require_context
def project_get_network_v6(context, project_id):
return project_get_network(context, project_id)
diff --git a/nova/utils.py b/nova/utils.py
index 888ebfd81..b08d5d620 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -47,7 +47,6 @@ TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
def import_class(import_str):
"""Returns a class from a string including module and class"""
mod_str, _sep, class_str = import_str.rpartition('.')
- logging.debug(import_str)
try:
__import__(mod_str)
return getattr(sys.modules[mod_str], class_str)