Support Storage Policy - Rev 4

Added Swift On File specific functional tests that checks SoF's
object naming convention by comparing names of objects PUT and
actual files found over mountpoint.

Remove old reference to keystone functional tests.

Signed-off-by: Prashanth Pai <ppai@redhat.com>

test/functional/swift_on_file_tests.py

@@ -0,0 +1,130 @@
+# Copyright (c) 2013 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""" OpenStack Swift based functional tests for Swift on File"""
+
+import os
+import re
+import hashlib
+
+from test.functional.tests import Base, Utils
+from test.functional.swift_test_client import Account, Connection, \
+    ResponseError
+import test.functional as tf
+
+
+class TestSwiftOnFileEnv:
+    @classmethod
+    def setUp(cls):
+        cls.conn = Connection(tf.config)
+        cls.conn.authenticate()
+        cls.account = Account(cls.conn, tf.config.get('account',
+                                                      tf.config['username']))
+        cls.root_dir = os.path.join('/mnt/gluster-object',
+                                    cls.account.conn.storage_url.split(
+                                        '/')[2].split('_')[1])
+        cls.account.delete_containers()
+
+        cls.file_size = 8
+        cls.container = cls.account.container(Utils.create_name())
+        if not cls.container.create():
+            raise ResponseError(cls.conn.response)
+
+        cls.dirs = [
+            'dir1',
+            'dir2',
+            'dir1/subdir1',
+            'dir1/subdir2',
+            'dir1/subdir1/subsubdir1',
+            'dir1/subdir1/subsubdir2',
+            'dir1/subdir with spaces',
+            'dir1/subdir+with{whatever',
+        ]
+
+        cls.files = [
+            'file1',
+            'file A',
+            'dir1/file2',
+            'dir1/subdir1/file2',
+            'dir1/subdir1/file3',
+            'dir1/subdir1/file4',
+            'dir1/subdir1/subsubdir1/file5',
+            'dir1/subdir1/subsubdir1/file6',
+            'dir1/subdir1/subsubdir1/file7',
+            'dir1/subdir1/subsubdir1/file8',
+            'dir1/subdir1/subsubdir2/file9',
+            'dir1/subdir1/subsubdir2/file0',
+            'dir1/subdir with spaces/file B',
+            'dir1/subdir+with{whatever/file D',
+        ]
+
+        stored_files = set()
+        for d in cls.dirs:
+            file = cls.container.file(d)
+            file.write(hdrs={'Content-Type': 'application/directory'})
+        for f in cls.files:
+            file = cls.container.file(f)
+            file.write_random(cls.file_size, hdrs={'Content-Type':
+                              'application/octet-stream'})
+            stored_files.add(f)
+        cls.stored_files = sorted(stored_files)
+        cls.sorted_objects = sorted(set(cls.dirs + cls.files))
+
+
+class TestSwiftOnFile(Base):
+    env = TestSwiftOnFileEnv
+    set_up = False
+
+    def testObjectsFromMountPoint(self):
+        found_files = []
+        found_dirs = []
+
+        def recurse_path(path, count=0):
+            if count > 10:
+                raise ValueError('too deep recursion')
+            self.assert_(os.path.exists(path))
+            for file in os.listdir(path):
+                if os.path.isdir(os.path.join(path, file)):
+                    recurse_path(os.path.join(path, file), count + 1)
+                    found_dirs.append(file)
+                elif os.path.isfile(os.path.join(path, file)):
+                    filename = os.path.join(os.path.relpath(path, os.path.join(
+                        self.env.root_dir, self.env.account.name,
+                        self.env.container.name)), file)
+                    if re.match('^[\.]', filename):
+                        filename = filename[2:]
+                    found_files.append(filename)
+                else:
+                    pass  # Just a Place holder
+
+        recurse_path(os.path.join(self.env.root_dir, self.env.account.name,
+                                  self.env.container.name))
+        for file in self.env.stored_files:
+                self.assert_(file in found_files)
+                self.assert_(file not in found_dirs)
+
+    def testObjectContentFromMountPoint(self):
+        file_name = Utils.create_name()
+        file_item = self.env.container.file(file_name)
+        file_item.write_random()
+        self.assert_status(201)
+        file_info = file_item.info()
+        fhOnMountPoint = open(os.path.join(self.env.root_dir,
+                              self.env.account.name, self.env.container.name,
+                              file_name), 'r')
+        data_read_from_mountP = fhOnMountPoint.read()
+        md5_returned = hashlib.md5(data_read_from_mountP).hexdigest()
+        self.assertEquals(md5_returned, file_info['etag'])
+        fhOnMountPoint.close()

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,pep8,functest,ksfunctest
+envlist = py26,py27,pep8,functest
 minversion = 1.6
 skipsdist = True