From a7e4f8f04c1b1cf83de4a4a45f75aefc15f8a6bf Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 16 Sep 2014 23:49:24 -0400 Subject: clients: update clients to juno b3 sync point Signed-off-by: Bruce Ashfield --- ...eutronclient-use-csv-flag-instead-of-json.patch | 33 ++++++++++------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-neutronclient/neutronclient-use-csv-flag-instead-of-json.patch') diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient/neutronclient-use-csv-flag-instead-of-json.patch b/meta-openstack/recipes-devtools/python/python-neutronclient/neutronclient-use-csv-flag-instead-of-json.patch index d9fade3..32541eb 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient/neutronclient-use-csv-flag-instead-of-json.patch +++ b/meta-openstack/recipes-devtools/python/python-neutronclient/neutronclient-use-csv-flag-instead-of-json.patch @@ -17,11 +17,11 @@ Signed-off-by: Keith Holman neutronclient/tests/unit/test_cli20_network.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/neutronclient/tests/unit/test_cli20_agents.py b/neutronclient/tests/unit/test_cli20_agents.py -index 1e75a92..ab01fb7 100644 ---- a/neutronclient/tests/unit/test_cli20_agents.py -+++ b/neutronclient/tests/unit/test_cli20_agents.py -@@ -25,7 +25,7 @@ class CLITestV20Agent(test_cli20.CLITestV20Base): +Index: git/neutronclient/tests/unit/test_cli20_agents.py +=================================================================== +--- git.orig/neutronclient/tests/unit/test_cli20_agents.py ++++ git/neutronclient/tests/unit/test_cli20_agents.py +@@ -25,7 +25,7 @@ def test_list_agents(self): contents = {'agents': [{'id': 'myname', 'agent_type': 'mytype', 'alive': True}]} @@ -30,7 +30,7 @@ index 1e75a92..ab01fb7 100644 resources = "agents" cmd = agent.ListAgent(test_cli20.MyApp(sys.stdout), None) -@@ -40,7 +40,7 @@ class CLITestV20Agent(test_cli20.CLITestV20Base): +@@ -40,7 +40,7 @@ def test_list_agents_field(self): contents = {'agents': [{'alive': True}]} @@ -39,28 +39,25 @@ index 1e75a92..ab01fb7 100644 resources = "agents" smile = ':-)' -diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py -index 5e9be2a..eb562d0 100644 ---- a/neutronclient/tests/unit/test_cli20_network.py -+++ b/neutronclient/tests/unit/test_cli20_network.py -@@ -262,7 +262,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): +Index: git/neutronclient/tests/unit/test_cli20_network.py +=================================================================== +--- git.orig/neutronclient/tests/unit/test_cli20_network.py ++++ git/neutronclient/tests/unit/test_cli20_network.py +@@ -267,7 +267,7 @@ fields_1=['a', 'b'], fields_2=['c', 'd']) def _test_list_nets_columns(self, cmd, returned_body, -- args=['-f', 'json']): -+ args=['-f', 'csv']): +- args=('-f', 'json')): ++ args=('-f', 'csv')): resources = 'networks' self.mox.StubOutWithMock(network.ListNetwork, "extend_list") network.ListNetwork.extend_list(mox.IsA(list), mox.IgnoreArg()) -@@ -275,7 +275,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): +@@ -280,7 +280,7 @@ "tenant_id": "tenant_3", "subnets": []}]} self._test_list_nets_columns(cmd, returned_body, - args=['-f', 'json', '-c', 'id']) + args=['-f', 'csv', '-c', 'id']) _str = self.fake_stdout.make_string() - returned_networks = utils.loads(_str) + returned_networks = jsonutils.loads(_str) self.assertEqual(1, len(returned_networks)) --- -1.9.3 - -- cgit v1.2.3-54-g00ecf