octavia 12.0.0.0rc2__py3-none-any.whl → 13.0.0.0rc1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- octavia/amphorae/backends/agent/api_server/osutils.py +1 -0
- octavia/amphorae/backends/agent/api_server/plug.py +21 -7
- octavia/amphorae/backends/agent/api_server/templates/amphora-netns.systemd.j2 +2 -2
- octavia/amphorae/backends/agent/api_server/util.py +21 -0
- octavia/amphorae/backends/health_daemon/health_daemon.py +9 -3
- octavia/amphorae/backends/health_daemon/health_sender.py +2 -0
- octavia/amphorae/backends/utils/interface.py +14 -6
- octavia/amphorae/backends/utils/interface_file.py +6 -3
- octavia/amphorae/backends/utils/keepalivedlvs_query.py +8 -9
- octavia/amphorae/drivers/driver_base.py +1 -2
- octavia/amphorae/drivers/haproxy/rest_api_driver.py +11 -25
- octavia/amphorae/drivers/health/heartbeat_udp.py +34 -24
- octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py +3 -12
- octavia/amphorae/drivers/noop_driver/driver.py +3 -5
- octavia/api/common/pagination.py +4 -4
- octavia/api/drivers/amphora_driver/v2/driver.py +11 -5
- octavia/api/drivers/driver_agent/driver_get.py +22 -14
- octavia/api/drivers/driver_agent/driver_updater.py +8 -4
- octavia/api/drivers/utils.py +4 -2
- octavia/api/healthcheck/healthcheck_plugins.py +4 -2
- octavia/api/root_controller.py +4 -1
- octavia/api/v2/controllers/amphora.py +35 -38
- octavia/api/v2/controllers/availability_zone_profiles.py +43 -33
- octavia/api/v2/controllers/availability_zones.py +22 -18
- octavia/api/v2/controllers/flavor_profiles.py +37 -28
- octavia/api/v2/controllers/flavors.py +19 -15
- octavia/api/v2/controllers/health_monitor.py +44 -33
- octavia/api/v2/controllers/l7policy.py +52 -40
- octavia/api/v2/controllers/l7rule.py +68 -55
- octavia/api/v2/controllers/listener.py +88 -61
- octavia/api/v2/controllers/load_balancer.py +52 -34
- octavia/api/v2/controllers/member.py +63 -52
- octavia/api/v2/controllers/pool.py +55 -42
- octavia/api/v2/controllers/quotas.py +5 -3
- octavia/api/v2/types/listener.py +15 -0
- octavia/cmd/octavia_worker.py +0 -3
- octavia/cmd/status.py +1 -4
- octavia/common/clients.py +25 -45
- octavia/common/config.py +64 -22
- octavia/common/constants.py +3 -2
- octavia/common/data_models.py +7 -1
- octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py +12 -1
- octavia/common/jinja/haproxy/combined_listeners/templates/macros.j2 +5 -2
- octavia/common/jinja/lvs/jinja_cfg.py +4 -2
- octavia/common/keystone.py +58 -5
- octavia/common/validate.py +35 -0
- octavia/compute/drivers/noop_driver/driver.py +6 -0
- octavia/controller/healthmanager/health_manager.py +3 -6
- octavia/controller/housekeeping/house_keeping.py +36 -37
- octavia/controller/worker/amphora_rate_limit.py +5 -4
- octavia/controller/worker/task_utils.py +57 -41
- octavia/controller/worker/v2/controller_worker.py +160 -103
- octavia/controller/worker/v2/flows/listener_flows.py +3 -0
- octavia/controller/worker/v2/flows/load_balancer_flows.py +9 -14
- octavia/controller/worker/v2/tasks/amphora_driver_tasks.py +152 -91
- octavia/controller/worker/v2/tasks/compute_tasks.py +4 -2
- octavia/controller/worker/v2/tasks/database_tasks.py +542 -400
- octavia/controller/worker/v2/tasks/network_tasks.py +119 -79
- octavia/db/api.py +26 -23
- octavia/db/base_models.py +2 -2
- octavia/db/healthcheck.py +2 -1
- octavia/db/migration/alembic_migrations/versions/632152d2d32e_add_http_strict_transport_security_.py +42 -0
- octavia/db/models.py +12 -2
- octavia/db/prepare.py +2 -0
- octavia/db/repositories.py +462 -482
- octavia/hacking/checks.py +1 -1
- octavia/network/base.py +0 -14
- octavia/network/drivers/neutron/allowed_address_pairs.py +92 -135
- octavia/network/drivers/neutron/base.py +65 -77
- octavia/network/drivers/neutron/utils.py +69 -85
- octavia/network/drivers/noop_driver/driver.py +0 -7
- octavia/statistics/drivers/update_db.py +10 -10
- octavia/tests/common/constants.py +91 -84
- octavia/tests/common/sample_data_models.py +13 -1
- octavia/tests/fixtures.py +32 -0
- octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py +9 -10
- octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py +260 -15
- octavia/tests/functional/api/test_root_controller.py +3 -28
- octavia/tests/functional/api/v2/base.py +5 -3
- octavia/tests/functional/api/v2/test_amphora.py +18 -5
- octavia/tests/functional/api/v2/test_availability_zone_profiles.py +1 -0
- octavia/tests/functional/api/v2/test_listener.py +51 -19
- octavia/tests/functional/api/v2/test_load_balancer.py +10 -1
- octavia/tests/functional/db/base.py +31 -16
- octavia/tests/functional/db/test_models.py +27 -28
- octavia/tests/functional/db/test_repositories.py +407 -50
- octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py +2 -0
- octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py +1 -1
- octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py +54 -6
- octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py +35 -0
- octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py +8 -0
- octavia/tests/unit/amphorae/backends/health_daemon/test_health_sender.py +18 -0
- octavia/tests/unit/amphorae/backends/utils/test_interface.py +81 -0
- octavia/tests/unit/amphorae/backends/utils/test_interface_file.py +2 -0
- octavia/tests/unit/amphorae/backends/utils/test_keepalivedlvs_query.py +129 -5
- octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py +42 -20
- octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py +18 -20
- octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py +4 -4
- octavia/tests/unit/amphorae/drivers/noop_driver/test_driver.py +4 -1
- octavia/tests/unit/api/drivers/driver_agent/test_driver_get.py +3 -3
- octavia/tests/unit/api/drivers/driver_agent/test_driver_updater.py +11 -13
- octavia/tests/unit/base.py +6 -0
- octavia/tests/unit/cmd/test_interface.py +2 -2
- octavia/tests/unit/cmd/test_status.py +2 -2
- octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py +152 -1
- octavia/tests/unit/common/sample_configs/sample_configs_combined.py +10 -3
- octavia/tests/unit/common/test_clients.py +0 -39
- octavia/tests/unit/common/test_keystone.py +54 -0
- octavia/tests/unit/common/test_validate.py +67 -0
- octavia/tests/unit/controller/healthmanager/test_health_manager.py +8 -22
- octavia/tests/unit/controller/housekeeping/test_house_keeping.py +3 -64
- octavia/tests/unit/controller/worker/test_amphora_rate_limit.py +1 -1
- octavia/tests/unit/controller/worker/test_task_utils.py +44 -24
- octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py +0 -1
- octavia/tests/unit/controller/worker/v2/tasks/test_amphora_driver_tasks.py +49 -26
- octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py +399 -196
- octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py +37 -64
- octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py +3 -14
- octavia/tests/unit/controller/worker/v2/test_controller_worker.py +2 -2
- octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py +456 -561
- octavia/tests/unit/network/drivers/neutron/test_base.py +181 -194
- octavia/tests/unit/network/drivers/neutron/test_utils.py +14 -30
- octavia/tests/unit/statistics/drivers/test_update_db.py +7 -5
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/README.rst +1 -1
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/AUTHORS +4 -0
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/METADATA +4 -4
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/RECORD +141 -189
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/entry_points.txt +1 -2
- octavia-13.0.0.0rc1.dist-info/pbr.json +1 -0
- octavia/api/drivers/amphora_driver/v1/__init__.py +0 -11
- octavia/api/drivers/amphora_driver/v1/driver.py +0 -547
- octavia/controller/queue/v1/__init__.py +0 -11
- octavia/controller/queue/v1/consumer.py +0 -64
- octavia/controller/queue/v1/endpoints.py +0 -160
- octavia/controller/worker/v1/__init__.py +0 -11
- octavia/controller/worker/v1/controller_worker.py +0 -1157
- octavia/controller/worker/v1/flows/__init__.py +0 -11
- octavia/controller/worker/v1/flows/amphora_flows.py +0 -610
- octavia/controller/worker/v1/flows/health_monitor_flows.py +0 -105
- octavia/controller/worker/v1/flows/l7policy_flows.py +0 -94
- octavia/controller/worker/v1/flows/l7rule_flows.py +0 -100
- octavia/controller/worker/v1/flows/listener_flows.py +0 -128
- octavia/controller/worker/v1/flows/load_balancer_flows.py +0 -692
- octavia/controller/worker/v1/flows/member_flows.py +0 -230
- octavia/controller/worker/v1/flows/pool_flows.py +0 -127
- octavia/controller/worker/v1/tasks/__init__.py +0 -11
- octavia/controller/worker/v1/tasks/amphora_driver_tasks.py +0 -453
- octavia/controller/worker/v1/tasks/cert_task.py +0 -51
- octavia/controller/worker/v1/tasks/compute_tasks.py +0 -335
- octavia/controller/worker/v1/tasks/database_tasks.py +0 -2756
- octavia/controller/worker/v1/tasks/lifecycle_tasks.py +0 -173
- octavia/controller/worker/v1/tasks/model_tasks.py +0 -41
- octavia/controller/worker/v1/tasks/network_tasks.py +0 -970
- octavia/controller/worker/v1/tasks/retry_tasks.py +0 -74
- octavia/tests/unit/api/drivers/amphora_driver/v1/__init__.py +0 -11
- octavia/tests/unit/api/drivers/amphora_driver/v1/test_driver.py +0 -824
- octavia/tests/unit/controller/queue/v1/__init__.py +0 -11
- octavia/tests/unit/controller/queue/v1/test_consumer.py +0 -61
- octavia/tests/unit/controller/queue/v1/test_endpoints.py +0 -189
- octavia/tests/unit/controller/worker/v1/__init__.py +0 -11
- octavia/tests/unit/controller/worker/v1/flows/__init__.py +0 -11
- octavia/tests/unit/controller/worker/v1/flows/test_amphora_flows.py +0 -474
- octavia/tests/unit/controller/worker/v1/flows/test_health_monitor_flows.py +0 -72
- octavia/tests/unit/controller/worker/v1/flows/test_l7policy_flows.py +0 -67
- octavia/tests/unit/controller/worker/v1/flows/test_l7rule_flows.py +0 -67
- octavia/tests/unit/controller/worker/v1/flows/test_listener_flows.py +0 -91
- octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py +0 -431
- octavia/tests/unit/controller/worker/v1/flows/test_member_flows.py +0 -106
- octavia/tests/unit/controller/worker/v1/flows/test_pool_flows.py +0 -77
- octavia/tests/unit/controller/worker/v1/tasks/__init__.py +0 -11
- octavia/tests/unit/controller/worker/v1/tasks/test_amphora_driver_tasks.py +0 -792
- octavia/tests/unit/controller/worker/v1/tasks/test_cert_task.py +0 -46
- octavia/tests/unit/controller/worker/v1/tasks/test_compute_tasks.py +0 -634
- octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py +0 -2615
- octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks_quota.py +0 -415
- octavia/tests/unit/controller/worker/v1/tasks/test_lifecycle_tasks.py +0 -401
- octavia/tests/unit/controller/worker/v1/tasks/test_model_tasks.py +0 -44
- octavia/tests/unit/controller/worker/v1/tasks/test_network_tasks.py +0 -1788
- octavia/tests/unit/controller/worker/v1/tasks/test_retry_tasks.py +0 -47
- octavia/tests/unit/controller/worker/v1/test_controller_worker.py +0 -2096
- octavia-12.0.0.0rc2.dist-info/pbr.json +0 -1
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/LICENSE +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/README.rst +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/diskimage-create.sh +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/image-tests.sh +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/requirements.txt +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/test-requirements.txt +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/tox.ini +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/diskimage-create/version.txt +0 -0
- {octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/scripts/octavia-wsgi +0 -0
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/LICENSE +0 -0
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/WHEEL +0 -0
- {octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/top_level.txt +0 -0
@@ -1,160 +0,0 @@
|
|
1
|
-
# Copyright 2014 Rackspace
|
2
|
-
#
|
3
|
-
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
4
|
-
# not use this file except in compliance with the License. You may obtain
|
5
|
-
# a copy of the License at
|
6
|
-
#
|
7
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
8
|
-
#
|
9
|
-
# Unless required by applicable law or agreed to in writing, software
|
10
|
-
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
11
|
-
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
12
|
-
# License for the specific language governing permissions and limitations
|
13
|
-
# under the License.
|
14
|
-
|
15
|
-
from oslo_config import cfg
|
16
|
-
from oslo_log import log as logging
|
17
|
-
import oslo_messaging as messaging
|
18
|
-
from stevedore import driver as stevedore_driver
|
19
|
-
|
20
|
-
from octavia.common import constants
|
21
|
-
|
22
|
-
CONF = cfg.CONF
|
23
|
-
|
24
|
-
LOG = logging.getLogger(__name__)
|
25
|
-
|
26
|
-
|
27
|
-
class Endpoints(object):
|
28
|
-
|
29
|
-
# API version history:
|
30
|
-
# 1.0 - Initial version.
|
31
|
-
target = messaging.Target(
|
32
|
-
namespace=constants.RPC_NAMESPACE_CONTROLLER_AGENT,
|
33
|
-
version='1.1')
|
34
|
-
|
35
|
-
def __init__(self):
|
36
|
-
self.worker = stevedore_driver.DriverManager(
|
37
|
-
namespace='octavia.plugins',
|
38
|
-
name=CONF.octavia_plugins,
|
39
|
-
invoke_on_load=True
|
40
|
-
).driver
|
41
|
-
|
42
|
-
def create_load_balancer(self, context, load_balancer_id,
|
43
|
-
flavor=None, availability_zone=None):
|
44
|
-
LOG.info('Creating load balancer \'%s\'...', load_balancer_id)
|
45
|
-
self.worker.create_load_balancer(load_balancer_id, flavor,
|
46
|
-
availability_zone)
|
47
|
-
|
48
|
-
def update_load_balancer(self, context, load_balancer_id,
|
49
|
-
load_balancer_updates):
|
50
|
-
LOG.info('Updating load balancer \'%s\'...', load_balancer_id)
|
51
|
-
self.worker.update_load_balancer(load_balancer_id,
|
52
|
-
load_balancer_updates)
|
53
|
-
|
54
|
-
def delete_load_balancer(self, context, load_balancer_id, cascade=False):
|
55
|
-
LOG.info('Deleting load balancer \'%s\'...', load_balancer_id)
|
56
|
-
self.worker.delete_load_balancer(load_balancer_id, cascade)
|
57
|
-
|
58
|
-
def failover_load_balancer(self, context, load_balancer_id):
|
59
|
-
LOG.info('Failing over amphora in load balancer \'%s\'...',
|
60
|
-
load_balancer_id)
|
61
|
-
self.worker.failover_loadbalancer(load_balancer_id)
|
62
|
-
|
63
|
-
def failover_amphora(self, context, amphora_id):
|
64
|
-
LOG.info('Failing over amphora \'%s\'...',
|
65
|
-
amphora_id)
|
66
|
-
self.worker.failover_amphora(amphora_id)
|
67
|
-
|
68
|
-
def create_listener(self, context, listener_id):
|
69
|
-
LOG.info('Creating listener \'%s\'...', listener_id)
|
70
|
-
self.worker.create_listener(listener_id)
|
71
|
-
|
72
|
-
def update_listener(self, context, listener_id, listener_updates):
|
73
|
-
LOG.info('Updating listener \'%s\'...', listener_id)
|
74
|
-
self.worker.update_listener(listener_id, listener_updates)
|
75
|
-
|
76
|
-
def delete_listener(self, context, listener_id):
|
77
|
-
LOG.info('Deleting listener \'%s\'...', listener_id)
|
78
|
-
self.worker.delete_listener(listener_id)
|
79
|
-
|
80
|
-
def create_pool(self, context, pool_id):
|
81
|
-
LOG.info('Creating pool \'%s\'...', pool_id)
|
82
|
-
self.worker.create_pool(pool_id)
|
83
|
-
|
84
|
-
def update_pool(self, context, pool_id, pool_updates):
|
85
|
-
LOG.info('Updating pool \'%s\'...', pool_id)
|
86
|
-
self.worker.update_pool(pool_id, pool_updates)
|
87
|
-
|
88
|
-
def delete_pool(self, context, pool_id):
|
89
|
-
LOG.info('Deleting pool \'%s\'...', pool_id)
|
90
|
-
self.worker.delete_pool(pool_id)
|
91
|
-
|
92
|
-
def create_health_monitor(self, context, health_monitor_id):
|
93
|
-
LOG.info('Creating health monitor \'%s\'...', health_monitor_id)
|
94
|
-
self.worker.create_health_monitor(health_monitor_id)
|
95
|
-
|
96
|
-
def update_health_monitor(self, context, health_monitor_id,
|
97
|
-
health_monitor_updates):
|
98
|
-
LOG.info('Updating health monitor \'%s\'...', health_monitor_id)
|
99
|
-
self.worker.update_health_monitor(health_monitor_id,
|
100
|
-
health_monitor_updates)
|
101
|
-
|
102
|
-
def delete_health_monitor(self, context, health_monitor_id):
|
103
|
-
LOG.info('Deleting health monitor \'%s\'...', health_monitor_id)
|
104
|
-
self.worker.delete_health_monitor(health_monitor_id)
|
105
|
-
|
106
|
-
def create_member(self, context, member_id):
|
107
|
-
LOG.info('Creating member \'%s\'...', member_id)
|
108
|
-
self.worker.create_member(member_id)
|
109
|
-
|
110
|
-
def update_member(self, context, member_id, member_updates):
|
111
|
-
LOG.info('Updating member \'%s\'...', member_id)
|
112
|
-
self.worker.update_member(member_id, member_updates)
|
113
|
-
|
114
|
-
def batch_update_members(self, context, old_member_ids, new_member_ids,
|
115
|
-
updated_members):
|
116
|
-
updated_member_ids = [m.get('id') for m in updated_members]
|
117
|
-
LOG.info(
|
118
|
-
'Batch updating members: old=\'%(old)s\', new=\'%(new)s\', '
|
119
|
-
'updated=\'%(updated)s\'...',
|
120
|
-
{'old': old_member_ids, 'new': new_member_ids,
|
121
|
-
'updated': updated_member_ids})
|
122
|
-
self.worker.batch_update_members(
|
123
|
-
old_member_ids, new_member_ids, updated_members)
|
124
|
-
|
125
|
-
def delete_member(self, context, member_id):
|
126
|
-
LOG.info('Deleting member \'%s\'...', member_id)
|
127
|
-
self.worker.delete_member(member_id)
|
128
|
-
|
129
|
-
def create_l7policy(self, context, l7policy_id):
|
130
|
-
LOG.info('Creating l7policy \'%s\'...', l7policy_id)
|
131
|
-
self.worker.create_l7policy(l7policy_id)
|
132
|
-
|
133
|
-
def update_l7policy(self, context, l7policy_id, l7policy_updates):
|
134
|
-
LOG.info('Updating l7policy \'%s\'...', l7policy_id)
|
135
|
-
self.worker.update_l7policy(l7policy_id, l7policy_updates)
|
136
|
-
|
137
|
-
def delete_l7policy(self, context, l7policy_id):
|
138
|
-
LOG.info('Deleting l7policy \'%s\'...', l7policy_id)
|
139
|
-
self.worker.delete_l7policy(l7policy_id)
|
140
|
-
|
141
|
-
def create_l7rule(self, context, l7rule_id):
|
142
|
-
LOG.info('Creating l7rule \'%s\'...', l7rule_id)
|
143
|
-
self.worker.create_l7rule(l7rule_id)
|
144
|
-
|
145
|
-
def update_l7rule(self, context, l7rule_id, l7rule_updates):
|
146
|
-
LOG.info('Updating l7rule \'%s\'...', l7rule_id)
|
147
|
-
self.worker.update_l7rule(l7rule_id, l7rule_updates)
|
148
|
-
|
149
|
-
def delete_l7rule(self, context, l7rule_id):
|
150
|
-
LOG.info('Deleting l7rule \'%s\'...', l7rule_id)
|
151
|
-
self.worker.delete_l7rule(l7rule_id)
|
152
|
-
|
153
|
-
def update_amphora_agent_config(self, context, amphora_id):
|
154
|
-
LOG.info('Updating amphora \'%s\' agent configuration...',
|
155
|
-
amphora_id)
|
156
|
-
self.worker.update_amphora_agent_config(amphora_id)
|
157
|
-
|
158
|
-
def delete_amphora(self, context, amphora_id):
|
159
|
-
LOG.info('Deleting amphora \'%s\'...', amphora_id)
|
160
|
-
self.worker.delete_amphora(amphora_id)
|
@@ -1,11 +0,0 @@
|
|
1
|
-
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
2
|
-
# not use this file except in compliance with the License. You may obtain
|
3
|
-
# a copy of the License at
|
4
|
-
#
|
5
|
-
# http://www.apache.org/licenses/LICENSE-2.0
|
6
|
-
#
|
7
|
-
# Unless required by applicable law or agreed to in writing, software
|
8
|
-
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
9
|
-
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
10
|
-
# License for the specific language governing permissions and limitations
|
11
|
-
# under the License.
|