openstack/octavia
Code Issues Proposed changes

Merge "Remove unused FloatingIP data model"

Browse Source
This commit is contained in:
Zuul
2025-09-22 22:24:09 +00:00
committed by Gerrit Code Review
parent 633a1c9b71 83fc53e5bb
commit e414abb9e5
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
octavia/network/data_models.py
View File

@@ -115,26 +115,6 @@ class FixedIP(data_models.BaseDataModel):
self.subnet = subnet
class FloatingIP(data_models.BaseDataModel):
def __init__(self, id=None, description=None, project_id=None,
status=None, router_id=None, port_id=None,
floating_network_id=None, floating_ip_address=None,
fixed_ip_address=None, fixed_port_id=None):
self.id = id
self.description = description
self.project_id = project_id
self.status = status
self.router_id = router_id
self.port_id = port_id
self.floating_network_id = floating_network_id
self.floating_ip_address = floating_ip_address
self.fixed_ip_address = fixed_ip_address
self.fixed_port_id = fixed_port_id
# Need to provide this for compatibility in case it is used as a VIP
self.network_id = floating_network_id
class AmphoraNetworkConfig(data_models.BaseDataModel):
def __init__(self, amphora=None, vip_subnet=None, vip_port=None,

14
octavia/tests/common/constants.py
View File

@@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from octavia_lib.common import constants as lib_constants
from openstack.network.v2.floating_ip import FloatingIP
from openstack.network.v2.network import Network
from openstack.network.v2.network_ip_availability import NetworkIPAvailability
from openstack.network.v2.port import Port
@@ -170,19 +169,6 @@ MOCK_NETWORK = Network(**{'id': MOCK_NETWORK_ID,
'port_security_enabled': False})
MOCK_FIXED_IP = {'subnet_id': MOCK_SUBNET_ID,
'ip_address': MOCK_IP_ADDRESS}
MOCK_FLOATING_IP_ID = 'floating-ip-1'
MOCK_FLOATING_IP_DESC = 'TestFloatingIP1'
MOCK_ROUTER_ID = 'mock-router-1'
MOCK_FLOATING_IP = FloatingIP(**{'id': MOCK_FLOATING_IP_ID,
'description': MOCK_FLOATING_IP_DESC,
'tenant_id': MOCK_PROJECT_ID,
'status': MOCK_STATUS,
'port_id': MOCK_PORT_ID,
'router_id': MOCK_ROUTER_ID,
'floating_network_id': MOCK_NETWORK_ID,
'floating_ip_address': MOCK_IP_ADDRESS,
'fixed_ip_address': MOCK_IP_ADDRESS2,
'fixed_port_id': MOCK_PORT_ID2})
MOCK_AMP_ID1 = 'amp1-id'
MOCK_AMP_ID2 = 'amp2-id'