From 1f8b81462826284068b96ffce2648344c9e7c644 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Fri, 11 Sep 2015 00:46:03 -0500
Subject: Fix up object-store show commands

1) Change metadata to appear under a common 'properties' key, and
use the utility to format them, this applied to object, account
and container.

2) Clean up container and object output, which were setting the
x-container-meta-owner property, but this is metadata only for
the container, so it's pointless to have, removed it.

3) Container show was showing read/write ACLs and sync stuff, but
these are not being returned by my swift by default, so I moved
these to be checks, so we don't clutter the output.

Change-Id: Ife7521fe9c2724035b06963c118bd6016ba2f5b5
---
 openstackclient/tests/api/test_object_store_v1.py     | 9 +--------
 openstackclient/tests/object/v1/test_container_all.py | 3 ---
 openstackclient/tests/object/v1/test_object_all.py    | 2 --
 3 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'openstackclient/tests')

diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py
index 323bb8e0..0f7c4559 100644
--- a/openstackclient/tests/api/test_object_store_v1.py
+++ b/openstackclient/tests/api/test_object_store_v1.py
@@ -157,11 +157,6 @@ class TestContainer(TestObjectAPIv1):
             'container': 'qaz',
             'object_count': '1',
             'bytes_used': '577',
-            'meta-owner': FAKE_ACCOUNT,
-            'read_acl': None,
-            'write_acl': None,
-            'sync_to': None,
-            'sync_key': None,
         }
         self.requests_mock.register_uri(
             'HEAD',
@@ -323,10 +318,8 @@ class TestObject(TestObjectAPIv1):
             'content-type': 'text/alpha',
             'content-length': '577',
             'last-modified': '20130101',
-            'meta-owner': FAKE_ACCOUNT,
             'etag': 'qaz',
-            'wife': 'Wilma',
-            'x-tra-header': 'yabba-dabba-do',
+            'properties': {'wife': 'Wilma'},
         }
         self.requests_mock.register_uri(
             'HEAD',
diff --git a/openstackclient/tests/object/v1/test_container_all.py b/openstackclient/tests/object/v1/test_container_all.py
index 4477f2e0..69fc0f39 100644
--- a/openstackclient/tests/object/v1/test_container_all.py
+++ b/openstackclient/tests/object/v1/test_container_all.py
@@ -286,7 +286,6 @@ class TestContainerShow(TestContainerAll):
 
     def test_object_show_container(self):
         headers = {
-            'x-container-meta-owner': object_fakes.ACCOUNT_ID,
             'x-container-object-count': '42',
             'x-container-bytes-used': '123',
             'x-container-read': 'qaz',
@@ -316,7 +315,6 @@ class TestContainerShow(TestContainerAll):
             'account',
             'bytes_used',
             'container',
-            'meta-owner',
             'object_count',
             'read_acl',
             'sync_key',
@@ -328,7 +326,6 @@ class TestContainerShow(TestContainerAll):
             object_fakes.ACCOUNT_ID,
             '123',
             'ernie',
-            object_fakes.ACCOUNT_ID,
             '42',
             'qaz',
             'rfv',
diff --git a/openstackclient/tests/object/v1/test_object_all.py b/openstackclient/tests/object/v1/test_object_all.py
index 41fe6324..7a76ab76 100644
--- a/openstackclient/tests/object/v1/test_object_all.py
+++ b/openstackclient/tests/object/v1/test_object_all.py
@@ -160,7 +160,6 @@ class TestObjectShow(TestObjectAll):
             'content-type',
             'etag',
             'last-modified',
-            'meta-owner',
             'object',
             'x-object-manifest',
         )
@@ -172,7 +171,6 @@ class TestObjectShow(TestObjectAll):
             'text/plain',
             '4c4e39a763d58392724bccf76a58783a',
             'yesterday',
-            object_fakes.ACCOUNT_ID,
             object_fakes.object_name_1,
             'manifest',
         )
-- 
cgit v1.2.1