Merge lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-storage-protocol/trunk into lp:ubuntu/lucid/ubuntuone-storage-protocol

[dobey]

[lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-storage-protocol/trunk]

12. By James Westby on 2010-03-05

New upstream release.

13. By James Westby on 2010-03-05

Upload to lucid.

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-02-17 23:23:52 +0000
+++ PKG-INFO	2010-03-04 17:22:18 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: ubuntuone-storage-protocol
-Version: 1.1.2
+Version: 1.1.3
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-18 03:23:01 +0000
+++ debian/changelog	2010-03-04 17:22:18 +0000
@@ -1,3 +1,11 @@
+ubuntuone-storage-protocol (1.1.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Remove Vcs-Bzr and sync with ubuntu pkg branch
+  * Update homepage URL
+
+ -- Rodney Dawes <[e-mail]>  Thu, 04 Mar 2010 11:16:34 -0500
+
 ubuntuone-storage-protocol (1.1.2-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2009-12-07 17:00:00 +0000
+++ debian/control	2010-03-04 17:22:18 +0000
@@ -12,8 +12,7 @@
  python-twisted-core,
  python-oauth (>= 1.0~svn1092)
 Standards-Version: 3.8.3
-Homepage: https://ubuntuone.com
-Vcs-Bzr: https://code.launchpad.net/~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-storage-protocol/trunk
+Homepage: https://one.ubuntu.com
 
 Package: python-ubuntuone-storageprotocol
 Architecture: all
 
=== modified file 'setup.py'
--- setup.py	2010-02-17 23:23:52 +0000
+++ setup.py	2010-03-04 17:22:18 +0000
@@ -119,7 +119,7 @@
 
 
 setup(name='ubuntuone-storage-protocol',
-      version='1.1.2',
+      version='1.1.3',
       packages=['ubuntuone',
                 'ubuntuone.storageprotocol'],
      data_files=[('/etc/ssl/certs', 
 
=== modified file 'tests/test_throttling.py'
--- tests/test_throttling.py	2010-02-17 23:23:52 +0000
+++ tests/test_throttling.py	2010-03-04 17:22:18 +0000
@@ -25,6 +25,7 @@
 
 from ubuntuone.storageprotocol import client
 
+
 class FakeClient(object):
     """Fake a Client class that is handy for tests."""
 
@@ -55,7 +56,7 @@
         self.client = FakeClient()
         self.factories = []
         self.clock = task.Clock()
-        # use task.Clock instead of the reactor for the callLater
+        # use our custom clock instead of the reactor for the callLater
         self.old_callLater = client.ThrottlingStorageClientFactory.callLater
         client.ThrottlingStorageClientFactory.callLater = self.clock.callLater
 
@@ -64,22 +65,26 @@
             f.unregisterProtocol(None)
         client.ThrottlingStorageClientFactory.callLater = self.old_callLater
 
-    def create_factory(self, read_limit, write_limit):
+    def create_factory(self, enabled, read_limit, write_limit):
         """Create a ThrottlingStorageClientFactory with the specified args."""
-        tscf = client.ThrottlingStorageClientFactory(read_limit, write_limit)
+        tscf = client.ThrottlingStorageClientFactory(enabled, read_limit,
+                                                     write_limit)
         tscf.client = self.client
         self.factories.append(tscf)
         return tscf
 
+    def destroy_factory(self, factory):
+        """Turn off a factory and delete it form self.factories."""
+        del self.factories[self.factories.index(factory)]
+        factory.unregisterProtocol(None)
+
 
 class TestProducingState(BaseThrottlingTestCase):
-    """Test for filename validation and normalization."""
-
-    timeout = 5
+    """Tests for 'producing' state with different limit values."""
 
     def setUp(self):
         BaseThrottlingTestCase.setUp(self)
-        self.tscf = self.create_factory(3, 3)
+        self.tscf = self.create_factory(True, 3, 3)
 
     def test_under_write_limit(self):
         """Don't pas the write limit, no event."""
@@ -151,3 +156,305 @@
         self.clock.advance(2)
         self.assertEqual(self.client.events, ["thR", "unthR"])
 
+
+class TestLimitValuesInitialization(BaseThrottlingTestCase):
+    """Test read/write limit values."""
+
+    def _test_inactive_limits(self, read_limit, write_limit):
+        """Test read_limit and write_limit with throttling enabled."""
+        def check(tscf):
+            """Check that there is no delayed calls nor events."""
+            self.assertEquals(2, len(self.clock.getDelayedCalls()))
+            self.assertNotEquals(None, tscf.resetReadThisSecondID)
+            self.assertEquals(None, tscf.unthrottleReadsID)
+            self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+            self.assertEquals(None, tscf.unthrottleWritesID)
+            self.assertEqual(self.client.events, [])
+        tscf = self.create_factory(True, read_limit, write_limit)
+        check(tscf)
+        self.clock.advance(1.1)
+        check(tscf)
+
+    def test_both_None(self):
+        """Test for both limits None."""
+        self._test_inactive_limits(None, None)
+
+    def test_limits_0(self):
+        """Test for both limits 0."""
+        self.assertRaises(ValueError, self._test_inactive_limits, 0, 0)
+        self.assertRaises(ValueError, self._test_inactive_limits, 1, 0)
+        self.assertRaises(ValueError, self._test_inactive_limits, 0, 1)
+
+    def test_both_negative(self):
+        """Test for both limits -1."""
+        self.assertRaises(ValueError, self._test_inactive_limits, -1, -1)
+
+    def test_read_2_write_None(self):
+        """Test "off" writeLimit value and throttling enabled."""
+        tscf = self.create_factory(True, 2, None)
+        # check that resetReadThisSecondID is running
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        self.assertNotEquals(None, tscf.resetReadThisSecondID)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+        tscf.registerRead(4)
+        self.clock.advance(0.5)
+        self.assertEqual(self.client.events, ["thR"])
+        self.assertNotEquals(None, tscf.resetReadThisSecondID)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+
+    def test_read_None_write_2(self):
+        """Test "off" readLimit value and throttling enabled."""
+        tscf = self.create_factory(True, None, 2)
+        # check that resetWriteThisSecondID is running
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        self.assertNotEquals(None, tscf.resetReadThisSecondID)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+        tscf.registerWritten(4)
+        self.clock.advance(0.5)
+        self.assertEqual(self.client.events, ["thW"])
+        self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+        self.assertNotEquals(None, tscf.unthrottleWritesID)
+
+    def test_change_to_inavlid(self):
+        """Test setting invalid limit values after initialization."""
+        # yes, this is a unittest, I need to access protected members
+        # pylint: disable-msg=W0212
+        tscf = self.create_factory(True, 2, 2)
+        self.assertRaises(ValueError, tscf._set_read_limit, -1)
+        self.assertRaises(ValueError, tscf._set_write_limit, -1)
+
+
+class TestResetLoops(BaseThrottlingTestCase):
+    """Test the read/writeThisSecond reset loops."""
+
+    def test_read_this_second_loop(self):
+        """Test the reset loop for reads"""
+        tscf = self.create_factory(True, 4, 4)
+        tscf.registerRead(4)
+        self.assertEquals(4, tscf.readThisSecond)
+        self.clock.advance(1)
+        self.assertEquals(0, tscf.readThisSecond)
+
+    def test_write_this_second_loop(self):
+        """Test the reset loop for writes"""
+        tscf = self.create_factory(True, 4, 4)
+        tscf.registerWritten(4)
+        self.assertEquals(4, tscf.writtenThisSecond)
+        self.clock.advance(1)
+        self.assertEquals(0, tscf.writtenThisSecond)
+
+
+class TestCheckBandwidth(BaseThrottlingTestCase):
+    """Test the check[Read|Write]Bandwidth methods."""
+
+    def _test_with_limits(self, read, write):
+        """Test the check[Read|Wrte]Bandwidth using read and write limits."""
+        tscf = self.create_factory(True, read, write)
+        tscf.registerRead(4)
+        tscf.registerWritten(4)
+        self.assertEquals(4, tscf.readThisSecond)
+        self.assertEquals(4, tscf.writtenThisSecond)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.clock.advance(1)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+        self.assertEquals(0, tscf.readThisSecond)
+        self.assertEquals(0, tscf.writtenThisSecond)
+
+    def test_limits_0(self):
+        """Test the check[Read|Wrte]Bandwidth with both = 0."""
+        self.assertRaises(ValueError, self._test_with_limits, 0, 0)
+        self.assertRaises(ValueError, self._test_with_limits, 1, 0)
+        self.assertRaises(ValueError, self._test_with_limits, 0, 1)
+
+    def test_limits_None(self):
+        """Test the check[Read|Wrte]Bandwidth with both = None."""
+        self._test_with_limits(None, None)
+
+    def test_positive_limits(self):
+        """Test the check[Read|Wrte]Bandwidth with both > 0."""
+        tscf = self.create_factory(True, 2, 2)
+        tscf.registerRead(4)
+        tscf.registerWritten(4)
+        self.assertEquals(4, tscf.readThisSecond)
+        self.assertEquals(4, tscf.writtenThisSecond)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.clock.advance(.9)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.clock.advance(.1)
+        self.assertEquals(0, tscf.readThisSecond)
+        self.assertEquals(0, tscf.writtenThisSecond)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+
+
+class TestThrottlingLimits(BaseThrottlingTestCase):
+    """Test read/write limit behaviour and changes in runtime."""
+
+    def test_limit_None_then_gt_0(self):
+        """Test both None and change it to > 0."""
+        def check(tscf, events=None, delayed_calls=2):
+            """Check that there is no delayed calls nor events."""
+            self.assertEquals(delayed_calls, len(self.clock.getDelayedCalls()))
+            self.assertEqual(self.client.events, events or [])
+        tscf = self.create_factory(True, None, None)
+        self.clock.advance(1.1)
+        check(tscf)
+        tscf.readLimit = 2
+        tscf.writeLimit = 2
+        tscf.registerRead(4)
+        tscf.registerWritten(4)
+        self.clock.advance(0.9)
+        expected_events = ['thR', 'thW']
+        check(tscf, delayed_calls=4, events=expected_events)
+        self.clock.advance(1)
+        expected_events += ['unthR', 'unthW']
+        check(tscf, events=expected_events)
+        self.clock.advance(1.1)
+        check(tscf, events=expected_events)
+        tscf.registerRead(4)
+        tscf.registerWritten(4)
+        expected_events += ['thR', 'thW']
+        check(tscf, delayed_calls=4, events=expected_events)
+        self.clock.advance(.9)
+        check(tscf, delayed_calls=4, events=expected_events)
+        self.clock.advance(.1)
+        expected_events += ['unthR', 'unthW']
+        check(tscf, delayed_calls=2, events=expected_events)
+        tscf.registerRead(1)
+        tscf.registerWritten(1)
+        check(tscf, delayed_calls=2, events=expected_events)
+
+    def test_read_2_write_None(self):
+        """Test readLimit > 0 and writeLimit = None"""
+        tscf = self.create_factory(True, 2, None)
+        # check that resetReadThisSecondID is running
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        tscf.registerRead(4)
+        self.clock.advance(0.9)
+        expected_events = ['thR']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(0.9)
+        expected_events += ['unthR']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(.1)
+        self.assertEqual(self.client.events, expected_events)
+        # single throttling
+        tscf.registerRead(2)
+        self.clock.advance(0.1)
+        expected_events += ['thR', 'unthR']
+        self.assertEqual(self.client.events, expected_events)
+
+    def test_read_None_write_2(self):
+        """Test readLimit = None and writeLimit > 0"""
+        tscf = self.create_factory(True, None, 2)
+        # check that resetReadThisSecondID is running
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        tscf.registerWritten(4)
+        self.clock.advance(0.9)
+        expected_events = ['thW']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(0.9)
+        expected_events += ['unthW']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(.1)
+        self.assertEqual(self.client.events, expected_events)
+        # single throttling (trigger a callLater(0, ..)
+        tscf.registerWritten(2)
+        self.clock.advance(0.1)
+        expected_events += ['thW', 'unthW']
+        self.assertEqual(self.client.events, expected_events)
+
+    def test_change_read_to_None(self):
+        """Test changing the read limit from > 0 to None."""
+        tscf = self.create_factory(True, 2, None)
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        tscf.registerRead(4)
+        expected_events = ['thR']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(1.1)
+        expected_events += ['unthR']
+        self.assertEqual(self.client.events, expected_events)
+        tscf.readLimit = None
+        self.clock.advance(1)
+        self.assertEqual(self.client.events, expected_events)
+        tscf.registerRead(4)
+        self.clock.advance(1.1)
+        # no new events, throttling reads is off
+        self.assertEqual(self.client.events, expected_events)
+
+    def test_change_write_to_None(self):
+        """Test changing the write limit from > 0 to None."""
+        tscf = self.create_factory(True, None, 2)
+        self.assertEquals(2, len(self.clock.getDelayedCalls()))
+        tscf.registerWritten(4)
+        expected_events = ['thW']
+        self.assertEqual(self.client.events, expected_events)
+        self.clock.advance(1.1)
+        expected_events += ['unthW']
+        self.assertEqual(self.client.events, expected_events)
+        tscf.writeLimit = None
+        self.clock.advance(1)
+        self.assertEqual(self.client.events, expected_events)
+        tscf.registerWritten(4)
+        self.clock.advance(1.1)
+        # no new events, throttling reads is off
+        self.assertEqual(self.client.events, expected_events)
+
+
+class TestEnablement(BaseThrottlingTestCase):
+    """Tests for en/disabling throttling."""
+
+    def test_disabling(self):
+        """Tests that disabling throttling at runtime works as expected."""
+        tscf = self.create_factory(True, 2, 2)
+        self.assertNotEquals(None, tscf.resetReadThisSecondID)
+        self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+        tscf.registerRead(2)
+        tscf.registerWritten(2)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.assertNotEquals(None, tscf.unthrottleReadsID)
+        self.clock.advance(1.1)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+        tscf.disable_throttling()
+        self.assertFalse(tscf.throttling_enabled,
+                         "Throttling should be disabled.")
+        for delayed in [tscf.unthrottleReadsID, tscf.resetReadThisSecondID,
+                        tscf.unthrottleWritesID, tscf.resetWriteThisSecondID]:
+            cancelled = delayed is None or delayed.cancelled
+            self.assertTrue(cancelled)
+
+    def test_enabling(self):
+        """Tests that enabling throttling at runtime works as expected."""
+        tscf = self.create_factory(False, 2, 2)
+        self.assertEquals(None, tscf.resetReadThisSecondID)
+        self.assertEquals(None, tscf.resetWriteThisSecondID)
+        tscf.registerRead(2)
+        tscf.registerWritten(2)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.clock.advance(1)
+        self.assertEquals(None, tscf.unthrottleReadsID)
+        self.assertEquals(None, tscf.unthrottleWritesID)
+        self.assertEquals(None, tscf.resetReadThisSecondID)
+        self.assertEquals(None, tscf.resetWriteThisSecondID)
+        tscf.enable_throttling()
+        self.assertTrue(tscf.throttling_enabled,
+                         "Throttling should be enabled.")
+        self.assertNotEquals(None, tscf.resetReadThisSecondID)
+        self.assertNotEquals(None, tscf.resetWriteThisSecondID)
+        tscf.registerRead(3)
+        tscf.registerWritten(3)
+        for delayed in [tscf.unthrottleReadsID, tscf.resetReadThisSecondID,
+                        tscf.unthrottleWritesID, tscf.resetWriteThisSecondID]:
+            cancelled = delayed.cancelled
+            self.assertFalse(cancelled)
+
 
=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py	2010-02-17 23:23:52 +0000
+++ ubuntuone/storageprotocol/client.py	2010-03-04 17:22:18 +0000
@@ -1410,16 +1410,22 @@
     protocol = StorageClient
 
 
-class ThrottlingStorageClientFactory(StorageClientFactory):
+class ThrottlingStorageClientFactory(StorageClientFactory, object):
     """The throttling version of StorageClientFactory."""
 
     protocol = ThrottlingStorageClient
     client = None
 
-    def __init__(self, read_limit=None, write_limit=None):
+    def __init__(self, throttling_enabled=False,
+                 read_limit=None, write_limit=None):
         """Create the instance."""
-        self.readLimit = read_limit # max bytes we should read per second
-        self.writeLimit = write_limit # max bytes we should write per second
+        self._readLimit = None # max bytes we should read per second
+        self._writeLimit = None # max bytes we should write per second
+        self._throttling_reads = False
+        self._throttling_writes = False
+        self._set_read_limit(read_limit)
+        self._set_write_limit(write_limit)
+        self.throttling_enabled = throttling_enabled
         self.readThisSecond = 0
         self.writtenThisSecond = 0
         self.unthrottleReadsID = None
@@ -1427,15 +1433,46 @@
         self.unthrottleWritesID = None
         self.resetWriteThisSecondID = None
         self.stopped = True
+        if self.throttling_enabled:
+            self.enable_throttling()
+        else:
+            self.disable_throttling()
+
+    def valid_limit(self, limit):
+        """Check if limit is a valid valid."""
+        return limit is None or limit > 0
+
+    def _set_write_limit(self, limit):
+        """Set writeLimit value.
+
+        Raise a ValueError if the value ins't valid.
+        """
+        if not self.valid_limit(limit):
+            raise ValueError('Write limit must be greater than 0.')
+        self._writeLimit = limit
+
+    def _set_read_limit(self, limit):
+        """Set readLimit value.
+
+        Raise a ValueError if the value ins't valid.
+        """
+        if not self.valid_limit(limit):
+            raise ValueError('Read limit must be greater than 0.')
+        self._readLimit = limit
+    # it's a property, pylint: disable-msg=W0212
+    readLimit = property(lambda self: self._readLimit, _set_read_limit)
+    writeLimit = property(lambda self: self._writeLimit, _set_write_limit)
+    # pylint: enable-msg=W0212
 
     def callLater(self, period, func, *args, **kwargs):
         """Wrapper around L{reactor.callLater} for test purpose."""
         return reactor.callLater(period, func, *args, **kwargs)
 
     def maybeCallLater(self, id, period, func):
-        """Do a callLater only if we don't have a DelayedCall with the
+        """Maybe run callLater(period, func).
+
+        Only if we don't have a DelayedCall with the
         specified id already running.
-
         """
         delayed_call = getattr(self, id)
         # check if we already have a DelayedCall running
@@ -1446,38 +1483,49 @@
 
     def registerWritten(self, length):
         """Called by protocol to tell us more bytes were written."""
-        self.writtenThisSecond += length
-        self.checkWriteBandwidth()
+        if self.throttling_enabled:
+            self.writtenThisSecond += length
+            self.checkWriteBandwidth()
 
     def registerRead(self, length):
         """Called by protocol to tell us more bytes were read."""
-        self.readThisSecond += length
-        self.checkReadBandwidth()
+        if self.throttling_enabled:
+            self.readThisSecond += length
+            self.checkReadBandwidth()
+
+    def _get_throttle_time(self, bytes, limit):
+        """Calculate the throttle_time for bytes and limit."""
+        return (float(bytes) / limit) - 1.0
 
     def checkReadBandwidth(self):
         """Check if we've passed bandwidth limits."""
-        if self.readLimit is not None and \
-           self.readThisSecond > self.readLimit and \
-           self.unthrottleReadsID is None:
+        limit_check = self.valid_limit(self.readLimit) and \
+                self.readLimit is not None and \
+                self.readThisSecond >= self.readLimit
+        should_check = self.throttling_enabled and limit_check and \
+                self.unthrottleReadsID is None
+        if should_check:
             self.throttleReads()
-            throttle_time = (float(self.readThisSecond) / self.readLimit) - 1.0
+            throttle_time = self._get_throttle_time(self.readThisSecond,
+                                                    self.readLimit)
             log_debug("pause reads for: %s", str(throttle_time))
-            self.unthrottleReadsID = self.maybeCallLater('unthrottleReadsID',
-                                                         throttle_time,
-                                                         self.unthrottleReads)
+            self.unthrottleReadsID = self.maybeCallLater(
+                'unthrottleReadsID', throttle_time, self.unthrottleReads)
 
     def checkWriteBandwidth(self):
         """Check if we've passed bandwidth limits."""
-        if self.writeLimit is not None and \
-           self.writtenThisSecond > self.writeLimit and \
-           self.unthrottleWritesID is None:
+        limit_check = self.valid_limit(self.writeLimit) and \
+                self.writeLimit is not None and \
+                self.writtenThisSecond >= self.writeLimit
+        should_check = self.throttling_enabled and limit_check and \
+                self.unthrottleWritesID is None
+        if should_check:
             self.throttleWrites()
-            throttle_time = (float(self.writtenThisSecond) / self.writeLimit) \
-                    - 1.0
+            throttle_time = self._get_throttle_time(self.writtenThisSecond,
+                                                self.writeLimit)
             log_debug("pause writes for: %s", str(throttle_time))
-            self.unthrottleWritesID = self.maybeCallLater('unthrottleWritesID',
-                                                      throttle_time,
-                                                      self.unthrottleWrites)
+            self.unthrottleWritesID = self.maybeCallLater(
+                'unthrottleWritesID', throttle_time, self.unthrottleWrites)
 
     def _resetReadThisSecond(self):
         """Reset the counter named with 'name' every 1 second."""
@@ -1495,31 +1543,33 @@
     def throttleReads(self):
         """Throttle reads on all protocols."""
         if self.client is not None:
+            self._throttling_reads = True
             self.client.throttleReads()
 
     def unthrottleReads(self):
         """Stop throttling reads on all protocols."""
         self.unthrottleReadsID = None
         if self.client is not None:
+            self._throttling_reads = False
             self.client.unthrottleReads()
 
     def throttleWrites(self):
         """Throttle writes on all protocols."""
         if self.client is not None:
+            self._throttling_writes = True
             self.client.throttleWrites()
 
     def unthrottleWrites(self):
         """Stop throttling writes on all protocols."""
         self.unthrottleWritesID = None
         if self.client is not None:
+            self._throttling_writes = False
             self.client.unthrottleWrites()
 
     def buildProtocol(self, addr):
         """Build the protocol and start the counters reset loops."""
-        if self.readLimit is not None:
-            self._resetReadThisSecond()
-        if self.writeLimit is not None:
-            self._resetWrittenThisSecond()
+        if self.throttling_enabled:
+            self.enable_throttling()
         self.stopped = False
         return StorageClientFactory.buildProtocol(self, addr)
 
@@ -1529,7 +1579,6 @@
                         self.unthrottleWritesID, self.resetWriteThisSecondID]:
             self._cancel_delayed_call(delayed)
 
-
     def _cancel_delayed_call(self, delayed):
         """Safely cancel a DelayedCall."""
         if delayed is not None and not delayed.cancelled \
@@ -1540,6 +1589,32 @@
                 # ignore AlreadyCalledError
                 pass
 
+    def enable_throttling(self):
+        """Enable throttling and start the counter reset loops."""
+        # check if we need to start the reset loops
+        if self.resetReadThisSecondID is None and \
+           self.valid_limit(self.readLimit):
+            self._resetReadThisSecond()
+        if self.resetWriteThisSecondID is None and \
+           self.valid_limit(self.writeLimit):
+            self._resetWrittenThisSecond()
+        self.throttling_enabled = True
+
+    def disable_throttling(self):
+        """Disable throttling and cancel the counter reset loops."""
+        # unthrottle if there is an active unthrottle*ID
+        self._cancel_delayed_call(self.unthrottleReadsID)
+        self._cancel_delayed_call(self.unthrottleWritesID)
+        # Stop the reset loops
+        self._cancel_delayed_call(self.resetReadThisSecondID)
+        self._cancel_delayed_call(self.resetWriteThisSecondID)
+        # unthrottle read/writes
+        if self._throttling_reads:
+            self.unthrottleReads()
+        if self._throttling_writes:
+            self.unthrottleWrites()
+        self.throttling_enabled = False
+
 
 if __name__ == "__main__":
     # these 3 lines show the different ways of connecting a client to the
 
=== removed file 'ubuntuone/storageprotocol/dircontent_pb2.py'
--- ubuntuone/storageprotocol/dircontent_pb2.py	2010-02-17 23:23:52 +0000
+++ ubuntuone/storageprotocol/dircontent_pb2.py	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-from google.protobuf import descriptor
-from google.protobuf import message
-from google.protobuf import reflection
-from google.protobuf import service
-from google.protobuf import service_reflection
-from google.protobuf import descriptor_pb2
-_NODETYPE = descriptor.EnumDescriptor(
-  name='NodeType',
-  full_name='ubuntuone.storageprotocol.NodeType',
-  filename='NodeType',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='DIRECTORY', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='FILE', index=1, number=1,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SYMLINK', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-
-DIRECTORY = 0
-FILE = 1
-SYMLINK = 2
-
-
-
-_DIRECTORYENTRY = descriptor.Descriptor(
-  name='DirectoryEntry',
-  full_name='ubuntuone.storageprotocol.DirectoryEntry',
-  filename='ubuntuone/storageprotocol/dircontent.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.DirectoryEntry.name', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.DirectoryEntry.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node_type', full_name='ubuntuone.storageprotocol.DirectoryEntry.node_type', index=2,
-      number=3, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_DIRECTORYCONTENT = descriptor.Descriptor(
-  name='DirectoryContent',
-  full_name='ubuntuone.storageprotocol.DirectoryContent',
-  filename='ubuntuone/storageprotocol/dircontent.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='entries', full_name='ubuntuone.storageprotocol.DirectoryContent.entries', index=0,
-      number=1, type=11, cpp_type=10, label=3,
-      default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_DIRECTORYENTRY.fields_by_name['node_type'].enum_type = _NODETYPE
-_DIRECTORYCONTENT.fields_by_name['entries'].message_type = _DIRECTORYENTRY
-
-class DirectoryEntry(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _DIRECTORYENTRY
-
-class DirectoryContent(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _DIRECTORYCONTENT
-
 
=== removed file 'ubuntuone/storageprotocol/protocol_pb2.py'
--- ubuntuone/storageprotocol/protocol_pb2.py	2010-02-17 23:23:52 +0000
+++ ubuntuone/storageprotocol/protocol_pb2.py	1970-01-01 00:00:00 +0000
@@ -1,2018 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-from google.protobuf import descriptor
-from google.protobuf import message
-from google.protobuf import reflection
-from google.protobuf import service
-from google.protobuf import service_reflection
-from google.protobuf import descriptor_pb2
-
-
-_MESSAGE_MESSAGETYPE = descriptor.EnumDescriptor(
-  name='MessageType',
-  full_name='ubuntuone.storageprotocol.Message.MessageType',
-  filename='MessageType',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='NOOP', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ERROR', index=1, number=1,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='OK', index=2, number=2,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='PING', index=3, number=3,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='PONG', index=4, number=4,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='PROTOCOL_VERSION', index=5, number=5,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTH_REQUEST', index=6, number=6,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTH_REQUEST_TOKEN', index=7, number=7,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTH_REQUEST_TOKEN_READY', index=8, number=8,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTH_AUTHENTICATED', index=9, number=9,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ROOT', index=10, number=10,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MAKE_DIR', index=11, number=11,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MAKE_FILE', index=12, number=12,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NEW_DIR', index=13, number=13,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NEW_FILE', index=14, number=14,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='QUERY', index=15, number=15,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NODE_STATE', index=16, number=16,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='QUERY_END', index=17, number=17,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='GET_CONTENT', index=18, number=18,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='PUT_CONTENT', index=19, number=19,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='BEGIN_CONTENT', index=20, number=20,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='BYTES', index=21, number=21,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='EOF', index=22, number=22,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MOVE', index=23, number=23,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='UNLINK', index=24, number=24,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CREATE_SHARE', index=25, number=25,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='LIST_SHARES', index=26, number=26,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARES_INFO', index=27, number=27,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARES_END', index=28, number=28,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NOTIFY_SHARE', index=29, number=29,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARE_ACCEPTED', index=30, number=30,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARE_DELETED', index=31, number=31,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARE_CREATED', index=32, number=34,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='DELETE_SHARE', index=33, number=36,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CREATE_UDF', index=34, number=44,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='LIST_VOLUMES', index=35, number=45,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='VOLUMES_INFO', index=36, number=46,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='VOLUMES_END', index=37, number=47,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='VOLUME_DELETED', index=38, number=48,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='VOLUME_CREATED', index=39, number=49,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='DELETE_VOLUME', index=40, number=50,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CANCEL_REQUEST', index=41, number=32,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NODE_ATTR', index=42, number=33,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CANCELLED', index=43, number=35,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='QUERY_CAPS', index=44, number=37,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SET_CAPS', index=45, number=38,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ACCEPT_CAPS', index=46, number=39,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='FREE_SPACE_INFO', index=47, number=40,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='FREE_SPACE_INQUIRY', index=48, number=41,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ACCOUNT_INFO', index=49, number=42,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ACCOUNT_INQUIRY', index=50, number=43,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_ERROR_ERRORTYPE = descriptor.EnumDescriptor(
-  name='ErrorType',
-  full_name='ubuntuone.storageprotocol.Error.ErrorType',
-  filename='ErrorType',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='UNSUPPORTED_VERSION', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTHENTICATION_FAILED', index=1, number=1,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='INTERNAL_ERROR', index=2, number=2,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='AUTHENTICATION_REQUIRED', index=3, number=3,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NO_PERMISSION', index=4, number=4,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='ALREADY_EXISTS', index=5, number=5,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='DOES_NOT_EXIST', index=6, number=6,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NOT_A_DIRECTORY', index=7, number=7,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NOT_EMPTY', index=8, number=8,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NOT_AVAILABLE', index=9, number=9,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='UPLOAD_IN_PROGRESS', index=10, number=10,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='UPLOAD_CORRUPT', index=11, number=11,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='UPLOAD_CANCELED', index=12, number=12,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CONFLICT', index=13, number=13,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='TRY_AGAIN', index=14, number=14,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='PROTOCOL_ERROR', index=15, number=15,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='QUOTA_EXCEEDED', index=16, number=16,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='INVALID_FILENAME', index=17, number=17,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_CREATESHARE_ACCESSLEVEL = descriptor.EnumDescriptor(
-  name='AccessLevel',
-  full_name='ubuntuone.storageprotocol.CreateShare.AccessLevel',
-  filename='AccessLevel',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='VIEW', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MODIFY', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_SHARES_DIRECTION = descriptor.EnumDescriptor(
-  name='Direction',
-  full_name='ubuntuone.storageprotocol.Shares.Direction',
-  filename='Direction',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='TO_ME', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='FROM_ME', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_SHARES_ACCESSLEVEL = descriptor.EnumDescriptor(
-  name='AccessLevel',
-  full_name='ubuntuone.storageprotocol.Shares.AccessLevel',
-  filename='AccessLevel',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='VIEW', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MODIFY', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_NOTIFYSHARE_ACCESSLEVEL = descriptor.EnumDescriptor(
-  name='AccessLevel',
-  full_name='ubuntuone.storageprotocol.NotifyShare.AccessLevel',
-  filename='AccessLevel',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='VIEW', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='MODIFY', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_SHAREACCEPTED_ANSWER = descriptor.EnumDescriptor(
-  name='Answer',
-  full_name='ubuntuone.storageprotocol.ShareAccepted.Answer',
-  filename='Answer',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='YES', index=0, number=0,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='NO', index=1, number=1,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-_VOLUMES_VOLUMETYPE = descriptor.EnumDescriptor(
-  name='VolumeType',
-  full_name='ubuntuone.storageprotocol.Volumes.VolumeType',
-  filename='VolumeType',
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='ROOT', index=0, number=1,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='SHARE', index=1, number=2,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='UDF', index=2, number=3,
-      options=None,
-      type=None),
-  ],
-  options=None,
-)
-
-
-_MESSAGE = descriptor.Descriptor(
-  name='Message',
-  full_name='ubuntuone.storageprotocol.Message',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='id', full_name='ubuntuone.storageprotocol.Message.id', index=0,
-      number=1, type=5, cpp_type=1, label=2,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='type', full_name='ubuntuone.storageprotocol.Message.type', index=1,
-      number=2, type=14, cpp_type=8, label=2,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='error', full_name='ubuntuone.storageprotocol.Message.error', index=2,
-      number=3, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='protocol', full_name='ubuntuone.storageprotocol.Message.protocol', index=3,
-      number=4, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='auth_parameters', full_name='ubuntuone.storageprotocol.Message.auth_parameters', index=4,
-      number=5, type=11, cpp_type=10, label=3,
-      default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='root', full_name='ubuntuone.storageprotocol.Message.root', index=5,
-      number=6, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='query', full_name='ubuntuone.storageprotocol.Message.query', index=6,
-      number=7, type=11, cpp_type=10, label=3,
-      default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node_state', full_name='ubuntuone.storageprotocol.Message.node_state', index=7,
-      number=8, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='make', full_name='ubuntuone.storageprotocol.Message.make', index=8,
-      number=9, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='new', full_name='ubuntuone.storageprotocol.Message.new', index=9,
-      number=10, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='move', full_name='ubuntuone.storageprotocol.Message.move', index=10,
-      number=11, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='get_content', full_name='ubuntuone.storageprotocol.Message.get_content', index=11,
-      number=12, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='put_content', full_name='ubuntuone.storageprotocol.Message.put_content', index=12,
-      number=13, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='upload_in_progress', full_name='ubuntuone.storageprotocol.Message.upload_in_progress', index=13,
-      number=14, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='bytes', full_name='ubuntuone.storageprotocol.Message.bytes', index=14,
-      number=15, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='unlink', full_name='ubuntuone.storageprotocol.Message.unlink', index=15,
-      number=16, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='cancel_request', full_name='ubuntuone.storageprotocol.Message.cancel_request', index=16,
-      number=17, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node_attr', full_name='ubuntuone.storageprotocol.Message.node_attr', index=17,
-      number=18, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='create_share', full_name='ubuntuone.storageprotocol.Message.create_share', index=18,
-      number=19, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='shares', full_name='ubuntuone.storageprotocol.Message.shares', index=19,
-      number=20, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='notify_share', full_name='ubuntuone.storageprotocol.Message.notify_share', index=20,
-      number=21, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_accepted', full_name='ubuntuone.storageprotocol.Message.share_accepted', index=21,
-      number=22, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_deleted', full_name='ubuntuone.storageprotocol.Message.share_deleted', index=22,
-      number=23, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_created', full_name='ubuntuone.storageprotocol.Message.share_created', index=23,
-      number=24, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='delete_share', full_name='ubuntuone.storageprotocol.Message.delete_share', index=24,
-      number=25, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='create_udf', full_name='ubuntuone.storageprotocol.Message.create_udf', index=25,
-      number=33, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='list_volumes', full_name='ubuntuone.storageprotocol.Message.list_volumes', index=26,
-      number=34, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='volume_deleted', full_name='ubuntuone.storageprotocol.Message.volume_deleted', index=27,
-      number=35, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='volume_created', full_name='ubuntuone.storageprotocol.Message.volume_created', index=28,
-      number=36, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='delete_volume', full_name='ubuntuone.storageprotocol.Message.delete_volume', index=29,
-      number=37, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='query_caps', full_name='ubuntuone.storageprotocol.Message.query_caps', index=30,
-      number=26, type=11, cpp_type=10, label=3,
-      default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='set_caps', full_name='ubuntuone.storageprotocol.Message.set_caps', index=31,
-      number=27, type=11, cpp_type=10, label=3,
-      default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='accept_caps', full_name='ubuntuone.storageprotocol.Message.accept_caps', index=32,
-      number=28, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='free_space_info', full_name='ubuntuone.storageprotocol.Message.free_space_info', index=33,
-      number=29, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='free_space_inquiry', full_name='ubuntuone.storageprotocol.Message.free_space_inquiry', index=34,
-      number=30, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='account_info', full_name='ubuntuone.storageprotocol.Message.account_info', index=35,
-      number=31, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='begin_content', full_name='ubuntuone.storageprotocol.Message.begin_content', index=36,
-      number=32, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _MESSAGE_MESSAGETYPE,
-  ],
-  options=None)
-
-
-_ERROR = descriptor.Descriptor(
-  name='Error',
-  full_name='ubuntuone.storageprotocol.Error',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='type', full_name='ubuntuone.storageprotocol.Error.type', index=0,
-      number=1, type=14, cpp_type=8, label=2,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='comment', full_name='ubuntuone.storageprotocol.Error.comment', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _ERROR_ERRORTYPE,
-  ],
-  options=None)
-
-
-_PROTOCOL = descriptor.Descriptor(
-  name='Protocol',
-  full_name='ubuntuone.storageprotocol.Protocol',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='version', full_name='ubuntuone.storageprotocol.Protocol.version', index=0,
-      number=1, type=5, cpp_type=1, label=2,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_AUTHPARAMETER = descriptor.Descriptor(
-  name='AuthParameter',
-  full_name='ubuntuone.storageprotocol.AuthParameter',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.AuthParameter.name', index=0,
-      number=1, type=9, cpp_type=9, label=2,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='value', full_name='ubuntuone.storageprotocol.AuthParameter.value', index=1,
-      number=2, type=9, cpp_type=9, label=2,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_MAKE = descriptor.Descriptor(
-  name='Make',
-  full_name='ubuntuone.storageprotocol.Make',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.Make.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='parent_node', full_name='ubuntuone.storageprotocol.Make.parent_node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.Make.name', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_NEW = descriptor.Descriptor(
-  name='New',
-  full_name='ubuntuone.storageprotocol.New',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.New.node', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='parent_node', full_name='ubuntuone.storageprotocol.New.parent_node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.New.name', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_ROOT = descriptor.Descriptor(
-  name='Root',
-  full_name='ubuntuone.storageprotocol.Root',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.Root.node', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_QUERY = descriptor.Descriptor(
-  name='Query',
-  full_name='ubuntuone.storageprotocol.Query',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.Query.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.Query.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='hash', full_name='ubuntuone.storageprotocol.Query.hash', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_NODESTATE = descriptor.Descriptor(
-  name='NodeState',
-  full_name='ubuntuone.storageprotocol.NodeState',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.NodeState.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.NodeState.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='hash', full_name='ubuntuone.storageprotocol.NodeState.hash', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_GETCONTENT = descriptor.Descriptor(
-  name='GetContent',
-  full_name='ubuntuone.storageprotocol.GetContent',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.GetContent.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.GetContent.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='hash', full_name='ubuntuone.storageprotocol.GetContent.hash', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='offset', full_name='ubuntuone.storageprotocol.GetContent.offset', index=3,
-      number=4, type=3, cpp_type=2, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_CANCELREQUEST = descriptor.Descriptor(
-  name='CancelRequest',
-  full_name='ubuntuone.storageprotocol.CancelRequest',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_NODEATTR = descriptor.Descriptor(
-  name='NodeAttr',
-  full_name='ubuntuone.storageprotocol.NodeAttr',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='deflated_size', full_name='ubuntuone.storageprotocol.NodeAttr.deflated_size', index=0,
-      number=1, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='size', full_name='ubuntuone.storageprotocol.NodeAttr.size', index=1,
-      number=2, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='hash', full_name='ubuntuone.storageprotocol.NodeAttr.hash', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='crc32', full_name='ubuntuone.storageprotocol.NodeAttr.crc32', index=3,
-      number=4, type=13, cpp_type=3, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_BYTES = descriptor.Descriptor(
-  name='Bytes',
-  full_name='ubuntuone.storageprotocol.Bytes',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='bytes', full_name='ubuntuone.storageprotocol.Bytes.bytes', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_PUTCONTENT = descriptor.Descriptor(
-  name='PutContent',
-  full_name='ubuntuone.storageprotocol.PutContent',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.PutContent.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.PutContent.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='previous_hash', full_name='ubuntuone.storageprotocol.PutContent.previous_hash', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='hash', full_name='ubuntuone.storageprotocol.PutContent.hash', index=3,
-      number=4, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='crc32', full_name='ubuntuone.storageprotocol.PutContent.crc32', index=4,
-      number=5, type=13, cpp_type=3, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='size', full_name='ubuntuone.storageprotocol.PutContent.size', index=5,
-      number=6, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='deflated_size', full_name='ubuntuone.storageprotocol.PutContent.deflated_size', index=6,
-      number=7, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_BEGINCONTENT = descriptor.Descriptor(
-  name='BeginContent',
-  full_name='ubuntuone.storageprotocol.BeginContent',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='offset', full_name='ubuntuone.storageprotocol.BeginContent.offset', index=0,
-      number=2, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_UPLOADINPROGRESS = descriptor.Descriptor(
-  name='UploadInProgress',
-  full_name='ubuntuone.storageprotocol.UploadInProgress',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='upload', full_name='ubuntuone.storageprotocol.UploadInProgress.upload', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='timestamp', full_name='ubuntuone.storageprotocol.UploadInProgress.timestamp', index=1,
-      number=2, type=5, cpp_type=1, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_MOVE = descriptor.Descriptor(
-  name='Move',
-  full_name='ubuntuone.storageprotocol.Move',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.Move.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.Move.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='new_parent_node', full_name='ubuntuone.storageprotocol.Move.new_parent_node', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='new_name', full_name='ubuntuone.storageprotocol.Move.new_name', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_UNLINK = descriptor.Descriptor(
-  name='Unlink',
-  full_name='ubuntuone.storageprotocol.Unlink',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.Unlink.share', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.Unlink.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_CREATESHARE = descriptor.Descriptor(
-  name='CreateShare',
-  full_name='ubuntuone.storageprotocol.CreateShare',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.CreateShare.node', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_to', full_name='ubuntuone.storageprotocol.CreateShare.share_to', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.CreateShare.name', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='access_level', full_name='ubuntuone.storageprotocol.CreateShare.access_level', index=3,
-      number=4, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _CREATESHARE_ACCESSLEVEL,
-  ],
-  options=None)
-
-
-_SHARES = descriptor.Descriptor(
-  name='Shares',
-  full_name='ubuntuone.storageprotocol.Shares',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.Shares.share_id', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='direction', full_name='ubuntuone.storageprotocol.Shares.direction', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='subtree', full_name='ubuntuone.storageprotocol.Shares.subtree', index=2,
-      number=3, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_name', full_name='ubuntuone.storageprotocol.Shares.share_name', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='other_username', full_name='ubuntuone.storageprotocol.Shares.other_username', index=4,
-      number=5, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='other_visible_name', full_name='ubuntuone.storageprotocol.Shares.other_visible_name', index=5,
-      number=6, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='accepted', full_name='ubuntuone.storageprotocol.Shares.accepted', index=6,
-      number=7, type=8, cpp_type=7, label=1,
-      default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='access_level', full_name='ubuntuone.storageprotocol.Shares.access_level', index=7,
-      number=8, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _SHARES_DIRECTION,
-    _SHARES_ACCESSLEVEL,
-  ],
-  options=None)
-
-
-_NOTIFYSHARE = descriptor.Descriptor(
-  name='NotifyShare',
-  full_name='ubuntuone.storageprotocol.NotifyShare',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.NotifyShare.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='subtree', full_name='ubuntuone.storageprotocol.NotifyShare.subtree', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share_name', full_name='ubuntuone.storageprotocol.NotifyShare.share_name', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='from_username', full_name='ubuntuone.storageprotocol.NotifyShare.from_username', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='from_visible_name', full_name='ubuntuone.storageprotocol.NotifyShare.from_visible_name', index=4,
-      number=5, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='access_level', full_name='ubuntuone.storageprotocol.NotifyShare.access_level', index=5,
-      number=6, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _NOTIFYSHARE_ACCESSLEVEL,
-  ],
-  options=None)
-
-
-_SHAREACCEPTED = descriptor.Descriptor(
-  name='ShareAccepted',
-  full_name='ubuntuone.storageprotocol.ShareAccepted',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.ShareAccepted.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='answer', full_name='ubuntuone.storageprotocol.ShareAccepted.answer', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _SHAREACCEPTED_ANSWER,
-  ],
-  options=None)
-
-
-_SHAREDELETED = descriptor.Descriptor(
-  name='ShareDeleted',
-  full_name='ubuntuone.storageprotocol.ShareDeleted',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.ShareDeleted.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_SHARECREATED = descriptor.Descriptor(
-  name='ShareCreated',
-  full_name='ubuntuone.storageprotocol.ShareCreated',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.ShareCreated.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_DELETESHARE = descriptor.Descriptor(
-  name='DeleteShare',
-  full_name='ubuntuone.storageprotocol.DeleteShare',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.DeleteShare.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_CREATEUDF = descriptor.Descriptor(
-  name='CreateUDF',
-  full_name='ubuntuone.storageprotocol.CreateUDF',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='path', full_name='ubuntuone.storageprotocol.CreateUDF.path', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='name', full_name='ubuntuone.storageprotocol.CreateUDF.name', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_UDFS = descriptor.Descriptor(
-  name='UDFs',
-  full_name='ubuntuone.storageprotocol.UDFs',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='volume', full_name='ubuntuone.storageprotocol.UDFs.volume', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='node', full_name='ubuntuone.storageprotocol.UDFs.node', index=1,
-      number=2, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='suggested_path', full_name='ubuntuone.storageprotocol.UDFs.suggested_path', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_VOLUMEDELETED = descriptor.Descriptor(
-  name='VolumeDeleted',
-  full_name='ubuntuone.storageprotocol.VolumeDeleted',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='volume', full_name='ubuntuone.storageprotocol.VolumeDeleted.volume', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_DELETEVOLUME = descriptor.Descriptor(
-  name='DeleteVolume',
-  full_name='ubuntuone.storageprotocol.DeleteVolume',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='volume', full_name='ubuntuone.storageprotocol.DeleteVolume.volume', index=0,
-      number=1, type=12, cpp_type=9, label=1,
-      default_value="",
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_VOLUMES = descriptor.Descriptor(
-  name='Volumes',
-  full_name='ubuntuone.storageprotocol.Volumes',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='type', full_name='ubuntuone.storageprotocol.Volumes.type', index=0,
-      number=1, type=14, cpp_type=8, label=1,
-      default_value=1,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='root', full_name='ubuntuone.storageprotocol.Volumes.root', index=1,
-      number=3, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='udf', full_name='ubuntuone.storageprotocol.Volumes.udf', index=2,
-      number=4, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='share', full_name='ubuntuone.storageprotocol.Volumes.share', index=3,
-      number=5, type=11, cpp_type=10, label=1,
-      default_value=None,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-    _VOLUMES_VOLUMETYPE,
-  ],
-  options=None)
-
-
-_QUERYCAPS = descriptor.Descriptor(
-  name='QueryCaps',
-  full_name='ubuntuone.storageprotocol.QueryCaps',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='capability', full_name='ubuntuone.storageprotocol.QueryCaps.capability', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_SETCAPS = descriptor.Descriptor(
-  name='SetCaps',
-  full_name='ubuntuone.storageprotocol.SetCaps',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='capability', full_name='ubuntuone.storageprotocol.SetCaps.capability', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_ACCEPTCAPS = descriptor.Descriptor(
-  name='AcceptCaps',
-  full_name='ubuntuone.storageprotocol.AcceptCaps',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='accepted', full_name='ubuntuone.storageprotocol.AcceptCaps.accepted', index=0,
-      number=1, type=8, cpp_type=7, label=1,
-      default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='redirect_hostname', full_name='ubuntuone.storageprotocol.AcceptCaps.redirect_hostname', index=1,
-      number=2, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='redirect_port', full_name='ubuntuone.storageprotocol.AcceptCaps.redirect_port', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='redirect_srvrecord', full_name='ubuntuone.storageprotocol.AcceptCaps.redirect_srvrecord', index=3,
-      number=4, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_FREESPACEINFO = descriptor.Descriptor(
-  name='FreeSpaceInfo',
-  full_name='ubuntuone.storageprotocol.FreeSpaceInfo',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.FreeSpaceInfo.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    descriptor.FieldDescriptor(
-      name='free_bytes', full_name='ubuntuone.storageprotocol.FreeSpaceInfo.free_bytes', index=1,
-      number=2, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_FREESPACEINQUIRY = descriptor.Descriptor(
-  name='FreeSpaceInquiry',
-  full_name='ubuntuone.storageprotocol.FreeSpaceInquiry',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='share_id', full_name='ubuntuone.storageprotocol.FreeSpaceInquiry.share_id', index=0,
-      number=1, type=9, cpp_type=9, label=1,
-      default_value=unicode("", "utf-8"),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_ACCOUNTINFO = descriptor.Descriptor(
-  name='AccountInfo',
-  full_name='ubuntuone.storageprotocol.AccountInfo',
-  filename='ubuntuone/storageprotocol/protocol.proto',
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='purchased_bytes', full_name='ubuntuone.storageprotocol.AccountInfo.purchased_bytes', index=0,
-      number=1, type=4, cpp_type=4, label=1,
-      default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],  # TODO(robinson): Implement.
-  enum_types=[
-  ],
-  options=None)
-
-
-_MESSAGE.fields_by_name['type'].enum_type = _MESSAGE_MESSAGETYPE
-_MESSAGE.fields_by_name['error'].message_type = _ERROR
-_MESSAGE.fields_by_name['protocol'].message_type = _PROTOCOL
-_MESSAGE.fields_by_name['auth_parameters'].message_type = _AUTHPARAMETER
-_MESSAGE.fields_by_name['root'].message_type = _ROOT
-_MESSAGE.fields_by_name['query'].message_type = _QUERY
-_MESSAGE.fields_by_name['node_state'].message_type = _NODESTATE
-_MESSAGE.fields_by_name['make'].message_type = _MAKE
-_MESSAGE.fields_by_name['new'].message_type = _NEW
-_MESSAGE.fields_by_name['move'].message_type = _MOVE
-_MESSAGE.fields_by_name['get_content'].message_type = _GETCONTENT
-_MESSAGE.fields_by_name['put_content'].message_type = _PUTCONTENT
-_MESSAGE.fields_by_name['upload_in_progress'].message_type = _UPLOADINPROGRESS
-_MESSAGE.fields_by_name['bytes'].message_type = _BYTES
-_MESSAGE.fields_by_name['unlink'].message_type = _UNLINK
-_MESSAGE.fields_by_name['cancel_request'].message_type = _CANCELREQUEST
-_MESSAGE.fields_by_name['node_attr'].message_type = _NODEATTR
-_MESSAGE.fields_by_name['create_share'].message_type = _CREATESHARE
-_MESSAGE.fields_by_name['shares'].message_type = _SHARES
-_MESSAGE.fields_by_name['notify_share'].message_type = _NOTIFYSHARE
-_MESSAGE.fields_by_name['share_accepted'].message_type = _SHAREACCEPTED
-_MESSAGE.fields_by_name['share_deleted'].message_type = _SHAREDELETED
-_MESSAGE.fields_by_name['share_created'].message_type = _SHARECREATED
-_MESSAGE.fields_by_name['delete_share'].message_type = _DELETESHARE
-_MESSAGE.fields_by_name['create_udf'].message_type = _CREATEUDF
-_MESSAGE.fields_by_name['list_volumes'].message_type = _VOLUMES
-_MESSAGE.fields_by_name['volume_deleted'].message_type = _VOLUMEDELETED
-_MESSAGE.fields_by_name['volume_created'].message_type = _VOLUMES
-_MESSAGE.fields_by_name['delete_volume'].message_type = _DELETEVOLUME
-_MESSAGE.fields_by_name['query_caps'].message_type = _QUERYCAPS
-_MESSAGE.fields_by_name['set_caps'].message_type = _SETCAPS
-_MESSAGE.fields_by_name['accept_caps'].message_type = _ACCEPTCAPS
-_MESSAGE.fields_by_name['free_space_info'].message_type = _FREESPACEINFO
-_MESSAGE.fields_by_name['free_space_inquiry'].message_type = _FREESPACEINQUIRY
-_MESSAGE.fields_by_name['account_info'].message_type = _ACCOUNTINFO
-_MESSAGE.fields_by_name['begin_content'].message_type = _BEGINCONTENT
-_ERROR.fields_by_name['type'].enum_type = _ERROR_ERRORTYPE
-_CREATESHARE.fields_by_name['access_level'].enum_type = _CREATESHARE_ACCESSLEVEL
-_SHARES.fields_by_name['direction'].enum_type = _SHARES_DIRECTION
-_SHARES.fields_by_name['access_level'].enum_type = _SHARES_ACCESSLEVEL
-_NOTIFYSHARE.fields_by_name['access_level'].enum_type = _NOTIFYSHARE_ACCESSLEVEL
-_SHAREACCEPTED.fields_by_name['answer'].enum_type = _SHAREACCEPTED_ANSWER
-_VOLUMES.fields_by_name['type'].enum_type = _VOLUMES_VOLUMETYPE
-_VOLUMES.fields_by_name['root'].message_type = _ROOT
-_VOLUMES.fields_by_name['udf'].message_type = _UDFS
-_VOLUMES.fields_by_name['share'].message_type = _SHARES
-
-class Message(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _MESSAGE
-
-class Error(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ERROR
-
-class Protocol(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _PROTOCOL
-
-class AuthParameter(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _AUTHPARAMETER
-
-class Make(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _MAKE
-
-class New(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _NEW
-
-class Root(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ROOT
-
-class Query(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _QUERY
-
-class NodeState(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _NODESTATE
-
-class GetContent(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _GETCONTENT
-
-class CancelRequest(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _CANCELREQUEST
-
-class NodeAttr(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _NODEATTR
-
-class Bytes(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _BYTES
-
-class PutContent(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _PUTCONTENT
-
-class BeginContent(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _BEGINCONTENT
-
-class UploadInProgress(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _UPLOADINPROGRESS
-
-class Move(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _MOVE
-
-class Unlink(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _UNLINK
-
-class CreateShare(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _CREATESHARE
-
-class Shares(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _SHARES
-
-class NotifyShare(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _NOTIFYSHARE
-
-class ShareAccepted(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _SHAREACCEPTED
-
-class ShareDeleted(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _SHAREDELETED
-
-class ShareCreated(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _SHARECREATED
-
-class DeleteShare(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _DELETESHARE
-
-class CreateUDF(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _CREATEUDF
-
-class UDFs(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _UDFS
-
-class VolumeDeleted(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _VOLUMEDELETED
-
-class DeleteVolume(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _DELETEVOLUME
-
-class Volumes(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _VOLUMES
-
-class QueryCaps(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _QUERYCAPS
-
-class SetCaps(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _SETCAPS
-
-class AcceptCaps(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ACCEPTCAPS
-
-class FreeSpaceInfo(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _FREESPACEINFO
-
-class FreeSpaceInquiry(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _FREESPACEINQUIRY
-
-class AccountInfo(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _ACCOUNTINFO
-