openstack
/
octavia
Code Issues Proposed changes

Merge "Rename tenant_id in the network models to project_id"

This commit is contained in:
Jenkins 2015-12-10 19:50:30 +00:00 committed by Gerrit Code Review
parent 97be0b2477 e260341783
commit 06f46b7cec
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
octavia/network/data_models.py
View File

@ -39,7 +39,7 @@ class Delta(data_models.BaseDataModel):
class Network(data_models.BaseDataModel):
def __init__(self, id=None, name=None, subnets=None,
tenant_id=None, admin_state_up=None, mtu=None,
project_id=None, admin_state_up=None, mtu=None,
provider_network_type=None,
provider_physical_network=None,
provider_segmentation_id=None,
@ -47,7 +47,7 @@ class Network(data_models.BaseDataModel):
self.id = id
self.name = name
self.subnets = subnets
self.tenant_id = tenant_id
self.project_id = project_id
self.admin_state_up = admin_state_up
self.provider_network_type = provider_network_type
self.provider_physical_network = provider_physical_network
@ -58,12 +58,12 @@ class Network(data_models.BaseDataModel):
class Subnet(data_models.BaseDataModel):
def __init__(self, id=None, name=None, network_id=None, tenant_id=None,
def __init__(self, id=None, name=None, network_id=None, project_id=None,
gateway_ip=None, cidr=None, ip_version=None):
self.id = id
self.name = name
self.network_id = network_id
self.tenant_id = tenant_id
self.project_id = project_id
self.gateway_ip = gateway_ip
self.cidr = cidr
self.ip_version = ip_version
@ -73,7 +73,7 @@ class Port(data_models.BaseDataModel):
def __init__(self, id=None, name=None, device_id=None, device_owner=None,
mac_address=None, network_id=None, status=None,
tenant_id=None, admin_state_up=None, fixed_ips=None,
project_id=None, admin_state_up=None, fixed_ips=None,
network=None):
self.id = id
self.name = name
@ -82,7 +82,7 @@ class Port(data_models.BaseDataModel):
self.mac_address = mac_address
self.network_id = network_id
self.status = status
self.tenant_id = tenant_id
self.project_id = project_id
self.admin_state_up = admin_state_up
self.fixed_ips = fixed_ips or []
self.network = network

6
octavia/network/drivers/neutron/utils.py
View File

@ -24,7 +24,7 @@ def convert_subnet_dict_to_model(subnet_dict):
subnet = subnet_dict.get('subnet', subnet_dict)
return network_models.Subnet(id=subnet.get('id'), name=subnet.get('name'),
network_id=subnet.get('network_id'),
tenant_id=subnet.get('tenant_id'),
project_id=subnet.get('tenant_id'),
gateway_ip=subnet.get('gateway_ip'),
cidr=subnet.get('cidr'),
ip_version=subnet.get('ip_version')
@ -44,7 +44,7 @@ def convert_port_dict_to_model(port_dict):
mac_address=port.get('mac_address'),
network_id=port.get('network_id'),
status=port.get('status'),
tenant_id=port.get('tenant_id'),
project_id=port.get('tenant_id'),
admin_state_up=port.get('admin_state_up'),
fixed_ips=fixed_ips
)
@ -56,7 +56,7 @@ def convert_network_dict_to_model(network_dict):
id=nw.get('id'),
name=nw.get('name'),
subnets=nw.get('subnets'),
tenant_id=nw.get('tenant_id'),
project_id=nw.get('tenant_id'),
admin_state_up=nw.get('admin_state_up'),
mtu=nw.get('mtu'),
provider_network_type=nw.get('provider:network_type'),

4
octavia/tests/unit/network/drivers/neutron/test_allowed_address_pairs.py
View File

@ -162,9 +162,9 @@ class TestAllowedAddressPairsDriver(base.TestCase):
def test_deallocate_vip_when_vip_port_not_found(self):
vip = data_models.Vip(port_id='1')
admin_tenant_id = 'octavia'
admin_project_id = 'octavia'
session_mock = mock.MagicMock()
session_mock.get_project_id.return_value = admin_tenant_id
session_mock.get_project_id.return_value = admin_project_id
self.k_session.return_value = session_mock
show_port = self.driver.neutron_client.show_port
show_port.side_effect = neutron_exceptions.PortNotFoundClient