From aefd2195b156e10884b580e1e3630380ea02c952 Mon Sep 17 00:00:00 2001
From: sunyajing <yajing.sun@easystack.cn>
Date: Wed, 8 Jun 2016 17:08:36 +0800
Subject: [PATCH] Fix network
modify ``columns, data`` to ``(columns, data)`` in network,
to keep code consistence.
Change-Id: I0522c499d1651b4ea948bebccbdfd520934e8e6a
---
openstackclient/network/v2/address_scope.py | 4 ++--
openstackclient/network/v2/ip_availability.py | 2 +-
openstackclient/network/v2/port.py | 4 ++--
openstackclient/network/v2/router.py | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index dbc6865fb4..ffd987ce5f 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -94,7 +94,7 @@ class CreateAddressScope(command.ShowOne):
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters={})
- return columns, data
+ return (columns, data)
class DeleteAddressScope(command.Command):
@@ -227,4 +227,4 @@ class ShowAddressScope(command.ShowOne):
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters={})
- return columns, data
+ return (columns, data)
diff --git a/openstackclient/network/v2/ip_availability.py b/openstackclient/network/v2/ip_availability.py
index cc240338f3..ff7b07c7c7 100644
--- a/openstackclient/network/v2/ip_availability.py
+++ b/openstackclient/network/v2/ip_availability.py
@@ -106,4 +106,4 @@ class ShowIPAvailability(command.ShowOne):
ignore_missing=False)
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters)
- return columns, data
+ return (columns, data)
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 7ef3964bf9..1a69d16c73 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -266,7 +266,7 @@ class CreatePort(command.ShowOne):
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters)
- return columns, data
+ return (columns, data)
class DeletePort(command.Command):
@@ -449,4 +449,4 @@ class ShowPort(command.ShowOne):
obj = client.find_port(parsed_args.port, ignore_missing=False)
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters)
- return columns, data
+ return (columns, data)
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index a2f0df1d8b..310f67406f 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -204,7 +204,7 @@ class CreateRouter(command.ShowOne):
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters)
- return columns, data
+ return (columns, data)
class DeleteRouter(command.Command):
@@ -450,4 +450,4 @@ class ShowRouter(command.ShowOne):
obj = client.find_router(parsed_args.router, ignore_missing=False)
columns = _get_columns(obj)
data = utils.get_item_properties(obj, columns, formatters=_formatters)
- return columns, data
+ return (columns, data)