Merge lp:~jaypipes/glance/bug717431 into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Support account:user:key in Swift URIs. Adds unit tests for various calls to parse_swift_tokens()

[Rick Harris (rconradharris)]

Looks good, thanks Jay!

review: Approve

[Cory Wright (corywright)]

lgtm.

review: Approve

=== modified file 'glance/store/swift.py'
--- glance/store/swift.py	2011-03-09 20:17:37 +0000
+++ glance/store/swift.py	2011-03-16 16:53:27 +0000
@@ -215,7 +215,16 @@
             # see lp659445 and Python issue7904
             creds, path = path.split('@')
 
-        user, key = creds.split(':')
+        cred_parts = creds.split(':')
+
+        # User can be account:user, in which case cred_parts[0:2] will be
+        # the account and user. Combine them into a single username of
+        # account:user
+        if len(cred_parts) == 3:
+            user = ':'.join(cred_parts[0:2])
+        else:
+            user = cred_parts[0]
+        key = cred_parts[-1]
         path_parts = path.split('/')
         obj = path_parts.pop()
         container = path_parts.pop()

=== modified file 'run_tests.py'
--- run_tests.py	2011-03-16 06:43:16 +0000
+++ run_tests.py	2011-03-16 16:53:27 +0000
@@ -129,8 +129,7 @@
             'yellow': red | green | bold,
             'magenta': red | blue | bold,
             'cyan': green | blue | bold,
-            'white': red | green | blue | bold
-            }
+            'white': red | green | blue | bold}
 
     def supported(cls, stream=sys.stdout):
         try:
@@ -238,15 +237,15 @@
                     elif self.dots:
                         stream.write(label[:1])
                 return
-            self.errors.append((test, exc_info))
-            test.passed = False
-            if stream is not None:
-                if self.showAll:
-                    self.colorizer.write("ERROR", 'red')
-                    self.stream.writeln()
-                elif self.dots:
-                    stream.write('E')
-    
+        self.errors.append((test, exc_info))
+        test.passed = False
+        if stream is not None:
+            if self.showAll:
+                self.colorizer.write("ERROR", 'red')
+                self.stream.writeln()
+            elif self.dots:
+                stream.write('E')
+
     def startTest(self, test):
         unittest.TestResult.startTest(self, test)
         current_case = test.test.__class__.__name__

=== modified file 'tests/unit/test_swift_store.py'
--- tests/unit/test_swift_store.py	2011-03-09 21:59:56 +0000
+++ tests/unit/test_swift_store.py	2011-03-16 16:53:27 +0000
@@ -29,7 +29,9 @@
 
 from glance.common import exception
 from glance.store import BackendException
-from glance.store.swift import SwiftBackend, format_swift_location
+from glance.store.swift import (SwiftBackend,
+                                format_swift_location,
+                                parse_swift_tokens)
 
 FIVE_KB = (5 * 1024)
 SWIFT_OPTIONS = {'verbose': True,
@@ -150,6 +152,41 @@
         """Clear the test environment"""
         self.stubs.UnsetAll()
 
+    def test_parse_swift_tokens(self):
+        """
+        Test that the parse_swift_tokens function returns
+        user, key, authurl, container, and objname properly
+        """
+        uri = "swift://user:key@localhost/v1.0/container/objname"
+        url_pieces = urlparse.urlparse(uri)
+        user, key, authurl, container, objname =\
+                parse_swift_tokens(url_pieces)
+        self.assertEqual("user", user)
+        self.assertEqual("key", key)
+        self.assertEqual("https://localhost/v1.0", authurl)
+        self.assertEqual("container", container)
+        self.assertEqual("objname", objname)
+
+        uri = "swift://user:key@localhost:9090/v1.0/container/objname"
+        url_pieces = urlparse.urlparse(uri)
+        user, key, authurl, container, objname =\
+                parse_swift_tokens(url_pieces)
+        self.assertEqual("user", user)
+        self.assertEqual("key", key)
+        self.assertEqual("https://localhost:9090/v1.0", authurl)
+        self.assertEqual("container", container)
+        self.assertEqual("objname", objname)
+
+        uri = "swift://account:user:key@localhost:9090/v1.0/container/objname"
+        url_pieces = urlparse.urlparse(uri)
+        user, key, authurl, container, objname =\
+                parse_swift_tokens(url_pieces)
+        self.assertEqual("account:user", user)
+        self.assertEqual("key", key)
+        self.assertEqual("https://localhost:9090/v1.0", authurl)
+        self.assertEqual("container", container)
+        self.assertEqual("objname", objname)
+
     def test_get(self):
         """Test a "normal" retrieval of an image in chunks"""
         url_pieces = urlparse.urlparse(