diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/health_monitor/__init__.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/behaviors.py similarity index 91% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/health_monitor/behaviors.py index 52e3d4c2..591c9390 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/models/request/__init__.py +++ b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/behaviors.py @@ -13,3 +13,6 @@ 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. """ + +from cafe.engine.behaviors import BaseBehavior + diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/health_monitor/client.py b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/client.py similarity index 98% rename from cloudcafe/networking/lbaas/lbaas_api/clients/health_monitor/client.py rename to cloudcafe/networking/lbaas/lbaas_api/health_monitor/client.py index 67a0a537..2ad0096d 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/clients/health_monitor/client.py +++ b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/client.py @@ -15,9 +15,9 @@ limitations under the License. """ from cloudcafe.networking.lbaas.common.client import BaseLoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.request \ import CreateHealthMonitor, UpdateHealthMonitor -from cloudcafe.networking.lbaas.lbaas_api.models.response.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.response \ import HealthMonitor, HealthMonitors diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/health_monitor.py b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/request.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/health_monitor.py rename to cloudcafe/networking/lbaas/lbaas_api/health_monitor/request.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/health_monitor.py b/cloudcafe/networking/lbaas/lbaas_api/health_monitor/response.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/health_monitor.py rename to cloudcafe/networking/lbaas/lbaas_api/health_monitor/response.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/health_monitor/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/listener/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/health_monitor/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/listener/__init__.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/listener/behaviors.py similarity index 91% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/listener/behaviors.py index 52e3d4c2..591c9390 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/models/response/__init__.py +++ b/cloudcafe/networking/lbaas/lbaas_api/listener/behaviors.py @@ -13,3 +13,6 @@ 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. """ + +from cafe.engine.behaviors import BaseBehavior + diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/listener/client.py b/cloudcafe/networking/lbaas/lbaas_api/listener/client.py similarity index 97% rename from cloudcafe/networking/lbaas/lbaas_api/clients/listener/client.py rename to cloudcafe/networking/lbaas/lbaas_api/listener/client.py index e27e2b1c..ae712a2a 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/clients/listener/client.py +++ b/cloudcafe/networking/lbaas/lbaas_api/listener/client.py @@ -15,9 +15,9 @@ limitations under the License. """ from cloudcafe.networking.lbaas.common.client import BaseLoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.listener import \ +from cloudcafe.networking.lbaas.lbaas_api.listener.request import \ CreateListener, UpdateListener -from cloudcafe.networking.lbaas.lbaas_api.models.response.listener import \ +from cloudcafe.networking.lbaas.lbaas_api.listener.response import \ Listener, Listeners diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/listener.py b/cloudcafe/networking/lbaas/lbaas_api/listener/request.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/listener.py rename to cloudcafe/networking/lbaas/lbaas_api/listener/request.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/listener.py b/cloudcafe/networking/lbaas/lbaas_api/listener/response.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/listener.py rename to cloudcafe/networking/lbaas/lbaas_api/listener/response.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/listener/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/listener/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/load_balancer/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/behaviors.py similarity index 91% rename from metatests/networking/lbaas/lbaas_api/behaviors/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/load_balancer/behaviors.py index 52e3d4c2..591c9390 100644 --- a/metatests/networking/lbaas/lbaas_api/behaviors/__init__.py +++ b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/behaviors.py @@ -13,3 +13,6 @@ 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. """ + +from cafe.engine.behaviors import BaseBehavior + diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/load_balancer/client.py b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/client.py similarity index 97% rename from cloudcafe/networking/lbaas/lbaas_api/clients/load_balancer/client.py rename to cloudcafe/networking/lbaas/lbaas_api/load_balancer/client.py index 5948b72d..2742682c 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/clients/load_balancer/client.py +++ b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/client.py @@ -15,9 +15,9 @@ limitations under the License. """ from cloudcafe.networking.lbaas.common.client import BaseLoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.load_balancer \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.request \ import CreateLoadBalancer, UpdateLoadBalancer -from cloudcafe.networking.lbaas.lbaas_api.models.response.load_balancer \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.response \ import LoadBalancer, LoadBalancers diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/load_balancer.py b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/request.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/load_balancer.py rename to cloudcafe/networking/lbaas/lbaas_api/load_balancer/request.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/load_balancer.py b/cloudcafe/networking/lbaas/lbaas_api/load_balancer/response.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/load_balancer.py rename to cloudcafe/networking/lbaas/lbaas_api/load_balancer/response.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/load_balancer/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/member/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/load_balancer/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/member/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/health_monitor/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/member/behaviors.py similarity index 91% rename from metatests/networking/lbaas/lbaas_api/behaviors/health_monitor/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/member/behaviors.py index 52e3d4c2..591c9390 100644 --- a/metatests/networking/lbaas/lbaas_api/behaviors/health_monitor/__init__.py +++ b/cloudcafe/networking/lbaas/lbaas_api/member/behaviors.py @@ -13,3 +13,6 @@ 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. """ + +from cafe.engine.behaviors import BaseBehavior + diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/member/client.py b/cloudcafe/networking/lbaas/lbaas_api/member/client.py similarity index 97% rename from cloudcafe/networking/lbaas/lbaas_api/clients/member/client.py rename to cloudcafe/networking/lbaas/lbaas_api/member/client.py index 119f4aeb..717c7e2a 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/clients/member/client.py +++ b/cloudcafe/networking/lbaas/lbaas_api/member/client.py @@ -15,9 +15,9 @@ limitations under the License. """ from cloudcafe.networking.lbaas.common.client import BaseLoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.member import \ +from cloudcafe.networking.lbaas.lbaas_api.member.request import \ CreateMember, UpdateMember -from cloudcafe.networking.lbaas.lbaas_api.models.response.member import \ +from cloudcafe.networking.lbaas.lbaas_api.member.response import \ Member, Members diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/member.py b/cloudcafe/networking/lbaas/lbaas_api/member/request.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/member.py rename to cloudcafe/networking/lbaas/lbaas_api/member/request.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/member.py b/cloudcafe/networking/lbaas/lbaas_api/member/response.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/member.py rename to cloudcafe/networking/lbaas/lbaas_api/member/response.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/member/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/pool/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/member/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/pool/__init__.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/pool/behaviors.py b/cloudcafe/networking/lbaas/lbaas_api/pool/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/cloudcafe/networking/lbaas/lbaas_api/pool/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/pool/client.py b/cloudcafe/networking/lbaas/lbaas_api/pool/client.py similarity index 97% rename from cloudcafe/networking/lbaas/lbaas_api/clients/pool/client.py rename to cloudcafe/networking/lbaas/lbaas_api/pool/client.py index 0ff82014..f8a8031a 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/clients/pool/client.py +++ b/cloudcafe/networking/lbaas/lbaas_api/pool/client.py @@ -15,9 +15,9 @@ limitations under the License. """ from cloudcafe.networking.lbaas.common.client import BaseLoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.pool import \ +from cloudcafe.networking.lbaas.lbaas_api.pool.request import \ CreatePool, UpdatePool -from cloudcafe.networking.lbaas.lbaas_api.models.response.pool import \ +from cloudcafe.networking.lbaas.lbaas_api.pool.response import \ Pool, Pools diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/pool.py b/cloudcafe/networking/lbaas/lbaas_api/pool/request.py similarity index 99% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/pool.py rename to cloudcafe/networking/lbaas/lbaas_api/pool/request.py index 667aff97..05e17eab 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/models/request/pool.py +++ b/cloudcafe/networking/lbaas/lbaas_api/pool/request.py @@ -19,7 +19,7 @@ import xml.etree.ElementTree as ET from cafe.engine.models.base import AutoMarshallingModel from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.session_persistence \ +from cloudcafe.networking.lbaas.lbaas_api.session_persistence.request \ import SetSessionPersistence diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/pool.py b/cloudcafe/networking/lbaas/lbaas_api/pool/response.py similarity index 99% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/pool.py rename to cloudcafe/networking/lbaas/lbaas_api/pool/response.py index 05c5a92f..497935e6 100644 --- a/cloudcafe/networking/lbaas/lbaas_api/models/response/pool.py +++ b/cloudcafe/networking/lbaas/lbaas_api/pool/response.py @@ -23,7 +23,7 @@ import xml.etree.ElementTree as ET from cafe.engine.models.base import \ AutoMarshallingModel, AutoMarshallingListModel from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.session_persistence \ +from cloudcafe.networking.lbaas.lbaas_api.session_persistence.response \ import SessionPersistence diff --git a/cloudcafe/networking/lbaas/lbaas_api/behaviors/pool/__init__.py b/cloudcafe/networking/lbaas/lbaas_api/session_persistence/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/behaviors/pool/__init__.py rename to cloudcafe/networking/lbaas/lbaas_api/session_persistence/__init__.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/request/session_persistence.py b/cloudcafe/networking/lbaas/lbaas_api/session_persistence/request.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/request/session_persistence.py rename to cloudcafe/networking/lbaas/lbaas_api/session_persistence/request.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/response/session_persistence.py b/cloudcafe/networking/lbaas/lbaas_api/session_persistence/response.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/response/session_persistence.py rename to cloudcafe/networking/lbaas/lbaas_api/session_persistence/response.py diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/__init__.py b/metatests/networking/lbaas/common/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/__init__.py rename to metatests/networking/lbaas/common/__init__.py diff --git a/metatests/networking/lbaas/common/client.py b/metatests/networking/lbaas/common/client.py new file mode 100644 index 00000000..b5c28676 --- /dev/null +++ b/metatests/networking/lbaas/common/client.py @@ -0,0 +1,38 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +import unittest2 as unittest + +from lbaascafe.lbaas.lbaas_api.clients.base_load_balancers_client \ + import BaseLoadBalancersClient + + +class BaseLoadBalancersClientFixture(unittest.TestCase): + """ + @summary: Base Load Balancers Client for Load Balancer Client Tests + """ + SERIALIZE = None + DESERIALIZE = None + + @classmethod + def setUpClass(cls): + super(BaseLoadBalancersClientFixture, cls).setUpClass() + + cls.auth_token = "fake_auth_token" + cls.load_balancer_id = "12345" + cls.url = "http://fake.url.endpoint" + cls.load_balancers_url = '{url}/{suffix}'.format( + url=cls.url, suffix=BaseLoadBalancersClient._SUFFIX) diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/listener/__init__.py b/metatests/networking/lbaas/lbaas_api/behaviors/listener/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/behaviors/listener/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/load_balancer/__init__.py b/metatests/networking/lbaas/lbaas_api/behaviors/load_balancer/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/behaviors/load_balancer/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/member/__init__.py b/metatests/networking/lbaas/lbaas_api/behaviors/member/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/behaviors/member/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/behaviors/pool/__init__.py b/metatests/networking/lbaas/lbaas_api/behaviors/pool/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/behaviors/pool/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/health_monitor/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/health_monitor/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/health_monitor/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/listener/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/listener/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/listener/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/load_balancer/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/load_balancer/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/load_balancer/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/member/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/member/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/member/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/clients/pool/__init__.py b/metatests/networking/lbaas/lbaas_api/clients/pool/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/clients/pool/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/health_monitor/__init__.py b/metatests/networking/lbaas/lbaas_api/health_monitor/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/health_monitor/__init__.py rename to metatests/networking/lbaas/lbaas_api/health_monitor/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/health_monitor/behaviors.py b/metatests/networking/lbaas/lbaas_api/health_monitor/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/metatests/networking/lbaas/lbaas_api/health_monitor/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/metatests/networking/lbaas/lbaas_api/clients/health_monitor/client.py b/metatests/networking/lbaas/lbaas_api/health_monitor/client.py similarity index 96% rename from metatests/networking/lbaas/lbaas_api/clients/health_monitor/client.py rename to metatests/networking/lbaas/lbaas_api/health_monitor/client.py index 1439a129..658ad1d5 100644 --- a/metatests/networking/lbaas/lbaas_api/clients/health_monitor/client.py +++ b/metatests/networking/lbaas/lbaas_api/health_monitor/client.py @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. """ -import mock import unittest -from cloudcafe.networking.lbaas.lbaas_api.clients.health_monitor.client \ +import mock + +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.client \ import HealthMonitorsClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.request \ import CreateHealthMonitor, UpdateHealthMonitor -from cloudcafe.networking.lbaas.lbaas_api.models.response.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.response \ import HealthMonitor, HealthMonitors diff --git a/metatests/networking/lbaas/lbaas_api/models/request/health_monitor.py b/metatests/networking/lbaas/lbaas_api/health_monitor/request.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/request/health_monitor.py rename to metatests/networking/lbaas/lbaas_api/health_monitor/request.py index 7215176d..92b0a08f 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/health_monitor.py +++ b/metatests/networking/lbaas/lbaas_api/health_monitor/request.py @@ -23,7 +23,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.request \ import CreateHealthMonitor, UpdateHealthMonitor diff --git a/metatests/networking/lbaas/lbaas_api/models/response/health_monitor.py b/metatests/networking/lbaas/lbaas_api/health_monitor/response.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/response/health_monitor.py rename to metatests/networking/lbaas/lbaas_api/health_monitor/response.py index 0879ab62..ea792d38 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/health_monitor.py +++ b/metatests/networking/lbaas/lbaas_api/health_monitor/response.py @@ -18,7 +18,7 @@ limitations under the License. import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.health_monitor \ +from cloudcafe.networking.lbaas.lbaas_api.health_monitor.response \ import HealthMonitor, HealthMonitors diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/listener/__init__.py b/metatests/networking/lbaas/lbaas_api/listener/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/listener/__init__.py rename to metatests/networking/lbaas/lbaas_api/listener/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/listener/behaviors.py b/metatests/networking/lbaas/lbaas_api/listener/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/metatests/networking/lbaas/lbaas_api/listener/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/metatests/networking/lbaas/lbaas_api/clients/listener/client.py b/metatests/networking/lbaas/lbaas_api/listener/client.py similarity index 96% rename from metatests/networking/lbaas/lbaas_api/clients/listener/client.py rename to metatests/networking/lbaas/lbaas_api/listener/client.py index 5a6212a6..7c97bf2b 100644 --- a/metatests/networking/lbaas/lbaas_api/clients/listener/client.py +++ b/metatests/networking/lbaas/lbaas_api/listener/client.py @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. """ -import mock import unittest -from cloudcafe.networking.lbaas.lbaas_api.clients.listener.client import \ +import mock + +from cloudcafe.networking.lbaas.lbaas_api.listener.client import \ ListenersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.listener import \ +from cloudcafe.networking.lbaas.lbaas_api.listener.request import \ CreateListener, UpdateListener -from cloudcafe.networking.lbaas.lbaas_api.models.response.listener import \ +from cloudcafe.networking.lbaas.lbaas_api.listener.response import \ Listener, Listeners diff --git a/metatests/networking/lbaas/lbaas_api/models/request/listener.py b/metatests/networking/lbaas/lbaas_api/listener/request.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/request/listener.py rename to metatests/networking/lbaas/lbaas_api/listener/request.py index 3e4f9ec7..edbda46f 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/listener.py +++ b/metatests/networking/lbaas/lbaas_api/listener/request.py @@ -23,7 +23,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.listener import \ +from cloudcafe.networking.lbaas.lbaas_api.listener.request import \ CreateListener, UpdateListener diff --git a/metatests/networking/lbaas/lbaas_api/models/response/listener.py b/metatests/networking/lbaas/lbaas_api/listener/response.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/response/listener.py rename to metatests/networking/lbaas/lbaas_api/listener/response.py index 0ca9da8d..88ca9111 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/listener.py +++ b/metatests/networking/lbaas/lbaas_api/listener/response.py @@ -23,7 +23,7 @@ ListenersResponseTest import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.listener \ +from cloudcafe.networking.lbaas.lbaas_api.listener.response \ import Listener, Listeners diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/load_balancer/__init__.py b/metatests/networking/lbaas/lbaas_api/load_balancer/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/load_balancer/__init__.py rename to metatests/networking/lbaas/lbaas_api/load_balancer/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/load_balancer/behaviors.py b/metatests/networking/lbaas/lbaas_api/load_balancer/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/metatests/networking/lbaas/lbaas_api/load_balancer/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/metatests/networking/lbaas/lbaas_api/clients/load_balancer/client.py b/metatests/networking/lbaas/lbaas_api/load_balancer/client.py similarity index 96% rename from metatests/networking/lbaas/lbaas_api/clients/load_balancer/client.py rename to metatests/networking/lbaas/lbaas_api/load_balancer/client.py index f1ed496a..0eac7871 100644 --- a/metatests/networking/lbaas/lbaas_api/clients/load_balancer/client.py +++ b/metatests/networking/lbaas/lbaas_api/load_balancer/client.py @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. """ -import mock import unittest -from cloudcafe.networking.lbaas.lbaas_api.clients.load_balancer.client \ +import mock + +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.client \ import LoadBalancersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.load_balancer \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.request \ import CreateLoadBalancer, UpdateLoadBalancer -from cloudcafe.networking.lbaas.lbaas_api.models.response.load_balancer \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.response \ import LoadBalancer, LoadBalancers diff --git a/metatests/networking/lbaas/lbaas_api/models/request/load_balancer.py b/metatests/networking/lbaas/lbaas_api/load_balancer/request.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/request/load_balancer.py rename to metatests/networking/lbaas/lbaas_api/load_balancer/request.py index c5e3a45a..13fc2a38 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/load_balancer.py +++ b/metatests/networking/lbaas/lbaas_api/load_balancer/request.py @@ -23,7 +23,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.load_balancer import \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.request import \ CreateLoadBalancer, UpdateLoadBalancer diff --git a/metatests/networking/lbaas/lbaas_api/models/response/load_balancer.py b/metatests/networking/lbaas/lbaas_api/load_balancer/response.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/response/load_balancer.py rename to metatests/networking/lbaas/lbaas_api/load_balancer/response.py index 2bf6a3e4..99f639a1 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/load_balancer.py +++ b/metatests/networking/lbaas/lbaas_api/load_balancer/response.py @@ -23,7 +23,7 @@ LoadBalancersResponseTest import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.load_balancer \ +from cloudcafe.networking.lbaas.lbaas_api.load_balancer.response \ import LoadBalancer, LoadBalancers diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/member/__init__.py b/metatests/networking/lbaas/lbaas_api/member/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/member/__init__.py rename to metatests/networking/lbaas/lbaas_api/member/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/member/behaviors.py b/metatests/networking/lbaas/lbaas_api/member/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/metatests/networking/lbaas/lbaas_api/member/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/metatests/networking/lbaas/lbaas_api/clients/member/client.py b/metatests/networking/lbaas/lbaas_api/member/client.py similarity index 95% rename from metatests/networking/lbaas/lbaas_api/clients/member/client.py rename to metatests/networking/lbaas/lbaas_api/member/client.py index 6ce3211f..5576178f 100644 --- a/metatests/networking/lbaas/lbaas_api/clients/member/client.py +++ b/metatests/networking/lbaas/lbaas_api/member/client.py @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. """ -import mock import unittest -from cloudcafe.networking.lbaas.lbaas_api.clients.member.client import \ +import mock + +from cloudcafe.networking.lbaas.lbaas_api.member.client import \ MembersClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.member import \ +from cloudcafe.networking.lbaas.lbaas_api.member.request import \ CreateMember, UpdateMember -from cloudcafe.networking.lbaas.lbaas_api.models.response.member import \ +from cloudcafe.networking.lbaas.lbaas_api.member.response import \ Member, Members diff --git a/metatests/networking/lbaas/lbaas_api/models/request/member.py b/metatests/networking/lbaas/lbaas_api/member/request.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/request/member.py rename to metatests/networking/lbaas/lbaas_api/member/request.py index f0455c85..e962fd74 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/member.py +++ b/metatests/networking/lbaas/lbaas_api/member/request.py @@ -23,7 +23,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.member import \ +from cloudcafe.networking.lbaas.lbaas_api.member.request import \ CreateMember, UpdateMember diff --git a/metatests/networking/lbaas/lbaas_api/models/response/member.py b/metatests/networking/lbaas/lbaas_api/member/response.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/response/member.py rename to metatests/networking/lbaas/lbaas_api/member/response.py index c0dcc4e5..ef237c8a 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/member.py +++ b/metatests/networking/lbaas/lbaas_api/member/response.py @@ -23,7 +23,7 @@ MembersResponseTest import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.member \ +from cloudcafe.networking.lbaas.lbaas_api.member.response \ import Member, Members diff --git a/metatests/networking/lbaas/lbaas_api/models/__init__.py b/metatests/networking/lbaas/lbaas_api/models/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/models/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/models/request/__init__.py b/metatests/networking/lbaas/lbaas_api/models/request/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/models/request/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/metatests/networking/lbaas/lbaas_api/models/response/__init__.py b/metatests/networking/lbaas/lbaas_api/models/response/__init__.py deleted file mode 100644 index 52e3d4c2..00000000 --- a/metatests/networking/lbaas/lbaas_api/models/response/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -""" -Copyright 2014 Rackspace - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -""" diff --git a/cloudcafe/networking/lbaas/lbaas_api/clients/pool/__init__.py b/metatests/networking/lbaas/lbaas_api/pool/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/clients/pool/__init__.py rename to metatests/networking/lbaas/lbaas_api/pool/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/pool/behaviors.py b/metatests/networking/lbaas/lbaas_api/pool/behaviors.py new file mode 100644 index 00000000..591c9390 --- /dev/null +++ b/metatests/networking/lbaas/lbaas_api/pool/behaviors.py @@ -0,0 +1,18 @@ +""" +Copyright 2014 Rackspace + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +""" + +from cafe.engine.behaviors import BaseBehavior + diff --git a/metatests/networking/lbaas/lbaas_api/clients/pool/client.py b/metatests/networking/lbaas/lbaas_api/pool/client.py similarity index 95% rename from metatests/networking/lbaas/lbaas_api/clients/pool/client.py rename to metatests/networking/lbaas/lbaas_api/pool/client.py index b9cac101..76c3b8ae 100644 --- a/metatests/networking/lbaas/lbaas_api/clients/pool/client.py +++ b/metatests/networking/lbaas/lbaas_api/pool/client.py @@ -14,14 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. """ -import mock import unittest -from cloudcafe.networking.lbaas.lbaas_api.clients.pool.client import \ +import mock + +from cloudcafe.networking.lbaas.lbaas_api.pool.client import \ PoolsClient -from cloudcafe.networking.lbaas.lbaas_api.models.request.pool import \ +from cloudcafe.networking.lbaas.lbaas_api.pool.request import \ CreatePool, UpdatePool -from cloudcafe.networking.lbaas.lbaas_api.models.response.pool import \ +from cloudcafe.networking.lbaas.lbaas_api.pool.response import \ Pool, Pools diff --git a/metatests/networking/lbaas/lbaas_api/models/request/pool.py b/metatests/networking/lbaas/lbaas_api/pool/request.py similarity index 98% rename from metatests/networking/lbaas/lbaas_api/models/request/pool.py rename to metatests/networking/lbaas/lbaas_api/pool/request.py index 1a062e9c..f0e009bf 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/pool.py +++ b/metatests/networking/lbaas/lbaas_api/pool/request.py @@ -23,7 +23,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.pool import \ +from cloudcafe.networking.lbaas.lbaas_api.pool.request import \ CreatePool, UpdatePool diff --git a/metatests/networking/lbaas/lbaas_api/models/response/pool.py b/metatests/networking/lbaas/lbaas_api/pool/response.py similarity index 97% rename from metatests/networking/lbaas/lbaas_api/models/response/pool.py rename to metatests/networking/lbaas/lbaas_api/pool/response.py index 29dee4b3..b2535a3e 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/pool.py +++ b/metatests/networking/lbaas/lbaas_api/pool/response.py @@ -23,9 +23,9 @@ PoolsResponseTest import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.pool \ +from cloudcafe.networking.lbaas.lbaas_api.pool.response \ import Pool, Pools -from cloudcafe.networking.lbaas.lbaas_api.models.response.session_persistence \ +from cloudcafe.networking.lbaas.lbaas_api.session_persistence.response \ import SessionPersistence diff --git a/cloudcafe/networking/lbaas/lbaas_api/models/__init__.py b/metatests/networking/lbaas/lbaas_api/session_persistence/__init__.py similarity index 100% rename from cloudcafe/networking/lbaas/lbaas_api/models/__init__.py rename to metatests/networking/lbaas/lbaas_api/session_persistence/__init__.py diff --git a/metatests/networking/lbaas/lbaas_api/models/request/session_persistence.py b/metatests/networking/lbaas/lbaas_api/session_persistence/request.py similarity index 96% rename from metatests/networking/lbaas/lbaas_api/models/request/session_persistence.py rename to metatests/networking/lbaas/lbaas_api/session_persistence/request.py index 50297752..5726087b 100644 --- a/metatests/networking/lbaas/lbaas_api/models/request/session_persistence.py +++ b/metatests/networking/lbaas/lbaas_api/session_persistence/request.py @@ -22,7 +22,7 @@ import json import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.request.session_persistence \ +from cloudcafe.networking.lbaas.lbaas_api.session_persistence.request \ import SetSessionPersistence diff --git a/metatests/networking/lbaas/lbaas_api/models/response/session_persistence.py b/metatests/networking/lbaas/lbaas_api/session_persistence/response.py similarity index 97% rename from metatests/networking/lbaas/lbaas_api/models/response/session_persistence.py rename to metatests/networking/lbaas/lbaas_api/session_persistence/response.py index bd1809c5..b6020d69 100644 --- a/metatests/networking/lbaas/lbaas_api/models/response/session_persistence.py +++ b/metatests/networking/lbaas/lbaas_api/session_persistence/response.py @@ -21,7 +21,7 @@ SessionPersistenceRequestTest import unittest from cloudcafe.networking.lbaas.common.constants import Constants -from cloudcafe.networking.lbaas.lbaas_api.models.response.session_persistence \ +from cloudcafe.networking.lbaas.lbaas_api.session_persistence.response \ import SessionPersistence