Author: pquerna
Date: Sat May 14 09:01:41 2011
New Revision: 1102975
URL: http://svn.apache.org/viewvc?rev=1102975&view=rev
Log:
Rename libcloud.resources.lb to libcloud.loadbalancer'
Added:
incubator/libcloud/trunk/libcloud/loadbalancer/
- copied from r1102972, incubator/libcloud/trunk/libcloud/resource/lb/
incubator/libcloud/trunk/test/loadbalancer/
- copied from r1102972, incubator/libcloud/trunk/test/resource/lb/
incubator/libcloud/trunk/test/loadbalancer/__init__.py (with props)
incubator/libcloud/trunk/test/loadbalancer/fixtures/
- copied from r1102974,
incubator/libcloud/trunk/test/resource/fixtures/lb/
Removed:
incubator/libcloud/trunk/libcloud/resource/lb/
incubator/libcloud/trunk/test/resource/fixtures/lb/
incubator/libcloud/trunk/test/resource/lb/
Modified:
incubator/libcloud/trunk/example_lb.py
incubator/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
incubator/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
incubator/libcloud/trunk/libcloud/loadbalancer/providers.py
incubator/libcloud/trunk/setup.py
incubator/libcloud/trunk/test/file_fixtures.py
incubator/libcloud/trunk/test/loadbalancer/test_gogrid.py
incubator/libcloud/trunk/test/loadbalancer/test_rackspace.py
Modified: incubator/libcloud/trunk/example_lb.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/example_lb.py?rev=1102975&r1=1102974&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/example_lb.py (original)
+++ incubator/libcloud/trunk/example_lb.py Sat May 14 09:01:41 2011
@@ -3,9 +3,9 @@
import os
import time
-from libcloud.resource.lb.base import LB, LBNode
-from libcloud.resource.lb.types import Provider, LBState
-from libcloud.resource.lb.providers import get_driver
+from libcloud.loadbalancer.base import LB, LBNode
+from libcloud.loadbalancer.types import Provider, LBState
+from libcloud.loadbalancer.providers import get_driver
def main():
Rackspace = get_driver(Provider.RACKSPACE)
Modified: incubator/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py?rev=1102975&r1=1102972&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py (original)
+++ incubator/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py Sat May 14
09:01:41 2011
@@ -23,8 +23,8 @@ except ImportError:
from libcloud.common.types import LibcloudError
from libcloud.common.gogrid import GoGridConnection, BaseGoGridDriver
-from libcloud.resource.lb.base import LB, LBNode, LBDriver
-from libcloud.resource.lb.types import Provider, LBState,
LibcloudLBImmutableError
+from libcloud.loadbalancer.base import LB, LBNode, LBDriver
+from libcloud.loadbalancer.types import Provider, LBState,
LibcloudLBImmutableError
class GoGridLBDriver(BaseGoGridDriver, LBDriver):
Modified: incubator/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py?rev=1102975&r1=1102972&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
(original)
+++ incubator/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py Sat May
14 09:01:41 2011
@@ -21,8 +21,8 @@ except ImportError:
import simplejson
from libcloud.common.base import Response
-from libcloud.resource.lb.base import LB, LBNode, LBDriver
-from libcloud.resource.lb.types import Provider, LBState
+from libcloud.loadbalancer.base import LB, LBNode, LBDriver
+from libcloud.loadbalancer.types import Provider, LBState
from libcloud.common.rackspace import (AUTH_HOST_US,
RackspaceBaseConnection)
Modified: incubator/libcloud/trunk/libcloud/loadbalancer/providers.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/loadbalancer/providers.py?rev=1102975&r1=1102972&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/loadbalancer/providers.py (original)
+++ incubator/libcloud/trunk/libcloud/loadbalancer/providers.py Sat May 14
09:01:41 2011
@@ -14,7 +14,7 @@
# limitations under the License.
from libcloud.utils import get_driver as get_provider_driver
-from libcloud.resource.lb.types import Provider
+from libcloud.loadbalancer.types import Provider
__all__ = [
"Provider",
@@ -24,9 +24,9 @@ __all__ = [
DRIVERS = {
Provider.RACKSPACE:
- ('libcloud.resource.lb.drivers.rackspace', 'RackspaceLBDriver'),
+ ('libcloud.loadbalancer.drivers.rackspace', 'RackspaceLBDriver'),
Provider.GOGRID:
- ('libcloud.resource.lb.drivers.gogrid', 'GoGridLBDriver'),
+ ('libcloud.loadbalancer.drivers.gogrid', 'GoGridLBDriver'),
}
def get_driver(provider):
Modified: incubator/libcloud/trunk/setup.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/setup.py?rev=1102975&r1=1102974&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/setup.py (original)
+++ incubator/libcloud/trunk/setup.py Sat May 14 09:01:41 2011
@@ -27,7 +27,7 @@ libcloud.utils.SHOW_DEPRECATION_WARNING
HTML_VIEWSOURCE_BASE = 'https://svn.apache.org/viewvc/incubator/libcloud/trunk'
PROJECT_BASE_DIR = 'http://incubator.apache.org/libcloud/'
-TEST_PATHS = [ 'test', 'test/compute', 'test/storage' ]
+TEST_PATHS = [ 'test', 'test/compute', 'test/storage' , 'test/loadbalancer']
DOC_TEST_MODULES = [ 'libcloud.compute.drivers.dummy',
'libcloud.storage.drivers.dummy' ]
@@ -150,9 +150,8 @@ setup(
'libcloud.compute',
'libcloud.compute.drivers',
'libcloud.drivers',
- 'libcloud.resource',
- 'libcloud.resource.lb',
- 'libcloud.resource.lb.drivers',
+ 'libcloud.loadbalancer',
+ 'libcloud.loadbalancer.drivers',
],
package_dir={
'libcloud': 'libcloud',
Modified: incubator/libcloud/trunk/test/file_fixtures.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/file_fixtures.py?rev=1102975&r1=1102974&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/file_fixtures.py (original)
+++ incubator/libcloud/trunk/test/file_fixtures.py Sat May 14 09:01:41 2011
@@ -20,7 +20,7 @@ import os
FIXTURES_ROOT = {
'compute': 'compute/fixtures',
'storage': 'storage/fixtures',
- 'resource': 'resource/fixtures',
+ 'loadbalancer': 'loadbalancer/fixtures',
}
class FileFixtures(object):
@@ -46,7 +46,7 @@ class StorageFileFixtures(FileFixtures):
super(StorageFileFixtures, self).__init__(fixtures_type='storage',
sub_dir=sub_dir)
-class ResourceFileFixtures(FileFixtures):
+class LoadBalancerFileFixtures(FileFixtures):
def __init__(self, sub_dir=''):
- super(ResourceFileFixtures, self).__init__(fixtures_type='resource',
+ super(LoadBalancerFileFixtures,
self).__init__(fixtures_type='loadbalancer',
sub_dir=sub_dir)
Added: incubator/libcloud/trunk/test/loadbalancer/__init__.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/loadbalancer/__init__.py?rev=1102975&view=auto
==============================================================================
--- incubator/libcloud/trunk/test/loadbalancer/__init__.py (added)
+++ incubator/libcloud/trunk/test/loadbalancer/__init__.py Sat May 14 09:01:41
2011
@@ -0,0 +1,14 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
Propchange: incubator/libcloud/trunk/test/loadbalancer/__init__.py
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/libcloud/trunk/test/loadbalancer/__init__.py
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/libcloud/trunk/test/loadbalancer/__init__.py
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/libcloud/trunk/test/loadbalancer/test_gogrid.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/loadbalancer/test_gogrid.py?rev=1102975&r1=1102972&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/loadbalancer/test_gogrid.py (original)
+++ incubator/libcloud/trunk/test/loadbalancer/test_gogrid.py Sat May 14
09:01:41 2011
@@ -3,11 +3,11 @@ import os.path
import sys
import unittest
-from libcloud.resource.lb.base import LB, LBNode
-from libcloud.resource.lb.drivers.gogrid import GoGridLBDriver
+from libcloud.loadbalancer.base import LB, LBNode
+from libcloud.loadbalancer.drivers.gogrid import GoGridLBDriver
from test import MockHttp, MockRawResponse
-from test.file_fixtures import ResourceFileFixtures
+from test.file_fixtures import LoadBalancerFileFixtures
class GoGridTests(unittest.TestCase):
@@ -76,7 +76,7 @@ class GoGridTests(unittest.TestCase):
self.assertTrue(ret)
class GoGridLBMockHttp(MockHttp):
- fixtures = ResourceFileFixtures(os.path.join('lb', 'gogrid'))
+ fixtures = LoadBalancerFileFixtures('gogrid')
def _api_grid_loadbalancer_list(self, method, url, body, headers):
body = self.fixtures.load('loadbalancer_list.json')
Modified: incubator/libcloud/trunk/test/loadbalancer/test_rackspace.py
URL:
http://svn.apache.org/viewvc/incubator/libcloud/trunk/test/loadbalancer/test_rackspace.py?rev=1102975&r1=1102972&r2=1102975&view=diff
==============================================================================
--- incubator/libcloud/trunk/test/loadbalancer/test_rackspace.py (original)
+++ incubator/libcloud/trunk/test/loadbalancer/test_rackspace.py Sat May 14
09:01:41 2011
@@ -3,11 +3,11 @@ import os.path
import sys
import unittest
-from libcloud.resource.lb.base import LB, LBNode
-from libcloud.resource.lb.drivers.rackspace import RackspaceLBDriver
+from libcloud.loadbalancer.base import LB, LBNode
+from libcloud.loadbalancer.drivers.rackspace import RackspaceLBDriver
from test import MockHttp, MockRawResponse
-from test.file_fixtures import ResourceFileFixtures
+from test.file_fixtures import LoadBalancerFileFixtures
class RackspaceLBTests(unittest.TestCase):
@@ -72,7 +72,7 @@ class RackspaceLBTests(unittest.TestCase
self.assertTrue(ret)
class RackspaceLBMockHttp(MockHttp):
- fixtures = ResourceFileFixtures(os.path.join('lb', 'rackspace'))
+ fixtures = LoadBalancerFileFixtures('rackspace')
def _v1_0(self, method, url, body, headers):
headers = {'x-server-management-url':
'https://servers.api.rackspacecloud.com/v1.0/slug',
