aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [1/2] Renamed Quota to ResourceAggregate.
Date Fri, 28 Feb 2014 21:58:27 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master c2614529b -> 130bc4873


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/130bc487/src/test/python/apache/aurora/client/api/test_updater.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/api/test_updater.py b/src/test/python/apache/aurora/client/api/test_updater.py
index 81406a0..c3e259c 100644
--- a/src/test/python/apache/aurora/client/api/test_updater.py
+++ b/src/test/python/apache/aurora/client/api/test_updater.py
@@ -40,7 +40,7 @@ from gen.apache.aurora.ttypes import (
   LockValidation,
   Package,
   PopulateJobResult,
-  Quota,
+  ResourceAggregate,
   Response,
   ResponseCode,
   Result,
@@ -220,11 +220,11 @@ class UpdaterTest(TestCase):
   def expect_quota_check(self, num_released, num_acquired, response_code=None, prod=True):
     response_code = ResponseCode.OK if response_code is None else response_code
     response = Response(responseCode=response_code, message='test')
-    released = CapacityRequest(Quota(
+    released = CapacityRequest(ResourceAggregate(
         numCpus=num_released * self._num_cpus,
         ramMb=num_released * self._num_ram,
         diskMb=num_released * self._num_disk))
-    acquired = CapacityRequest(Quota(
+    acquired = CapacityRequest(ResourceAggregate(
       numCpus=num_acquired * self._num_cpus,
       ramMb=num_acquired * self._num_ram,
       diskMb=num_acquired * self._num_disk))

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/130bc487/src/test/python/apache/aurora/client/cli/test_quota.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/aurora/client/cli/test_quota.py b/src/test/python/apache/aurora/client/cli/test_quota.py
index f7d3585..44afd74 100644
--- a/src/test/python/apache/aurora/client/cli/test_quota.py
+++ b/src/test/python/apache/aurora/client/cli/test_quota.py
@@ -21,7 +21,7 @@ from apache.aurora.client.cli.util import AuroraClientCommandTest, FakeAuroraCom
 
 from gen.apache.aurora.ttypes import (
     GetQuotaResult,
-    Quota,
+    ResourceAggregate,
 )
 
 from mock import patch
@@ -33,7 +33,7 @@ class TestGetQuotaCommand(AuroraClientCommandTest):
     api = mock_context.get_api('west')
     response = cls.create_simple_success_response()
     response.result.getQuotaResult = GetQuotaResult()
-    response.result.getQuotaResult.quota = Quota()
+    response.result.getQuotaResult.quota = ResourceAggregate()
     response.result.getQuotaResult.quota.numCpus = 5
     response.result.getQuotaResult.quota.ramMb = 20480
     response.result.getQuotaResult.quota.diskMb = 40960
@@ -45,11 +45,11 @@ class TestGetQuotaCommand(AuroraClientCommandTest):
     api = mock_context.get_api('west')
     response = cls.create_simple_success_response()
     response.result.getQuotaResult = GetQuotaResult()
-    response.result.getQuotaResult.quota = Quota()
+    response.result.getQuotaResult.quota = ResourceAggregate()
     response.result.getQuotaResult.quota.numCpus = 5
     response.result.getQuotaResult.quota.ramMb = 20480
     response.result.getQuotaResult.quota.diskMb = 40960
-    response.result.getQuotaResult.consumed = Quota()
+    response.result.getQuotaResult.consumed = ResourceAggregate()
     response.result.getQuotaResult.consumed.numCpus = 1
     response.result.getQuotaResult.consumed.ramMb = 1024
     response.result.getQuotaResult.consumed.diskMb = 2048

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/130bc487/src/test/resources/org/apache/aurora/gen/api.thrift.md5
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/aurora/gen/api.thrift.md5 b/src/test/resources/org/apache/aurora/gen/api.thrift.md5
index fafb510..4e6c51d 100644
--- a/src/test/resources/org/apache/aurora/gen/api.thrift.md5
+++ b/src/test/resources/org/apache/aurora/gen/api.thrift.md5
@@ -1 +1 @@
-cbc45c78b7a0a8f0c7cd0beb153d5b37
+7645e899bf5b7f8ad2dcdbecae7f91e1

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/130bc487/src/test/resources/org/apache/aurora/gen/storage.thrift.md5
----------------------------------------------------------------------
diff --git a/src/test/resources/org/apache/aurora/gen/storage.thrift.md5 b/src/test/resources/org/apache/aurora/gen/storage.thrift.md5
index 99ab202..9b94883 100644
--- a/src/test/resources/org/apache/aurora/gen/storage.thrift.md5
+++ b/src/test/resources/org/apache/aurora/gen/storage.thrift.md5
@@ -1 +1 @@
-ea63222d3337666cf221900e4fc8519b
+026d38531456b814c187cc19d7e24396


Mime
View raw message