Fixes for provider net subnet show and IP version

Fixes JIRA:NCP-1612 JIRA:NCP-1613 JIRA:NCP-1617

Fixes quotas and disallows fixed_ip create

Fixes JIRA:NCP-1626 JIRA:NCP-1389

Bonus: JIRA:NCP-1592

Shared IP general fixes

Fixes JIRA:NCP-1389 added quota for total IPs/port/network with new conf:
    total_ips_allowed_on_port

Fixes JIRA:NCP-1444 added quota for shared-ips/network with new conf:
    shared_ips_allowed_on_network

Fixes JIRA:NCP-1592 prevents all fixed ip interactions

Fixes JIRA:NCP-1630 will now follow rules for 'service' checking

Fixes JIRA:NCP-1631 will now follow rules for 'service' checking

Fixes JIRA:NCP-1633 will check the request port length against the found port
    length

Put update_port_for_ip into context block

Fixes JIRA:NCP-1637

Conflicts:
	quark/exceptions.py
	quark/plugin.py
	quark/plugin_modules/ip_addresses.py
	quark/tests/plugin_modules/test_ports.py
This commit is contained in:
Justin Hammond
2015-07-29 11:31:23 -05:00
parent 09088d8448
commit 4376ed417f
13 changed files with 577 additions and 240 deletions

View File

@@ -42,10 +42,6 @@ quark_view_opts = [
default=True,
help=_('Controls whether or not to show ip_policy_id for'
'subnets')),
cfg.BoolOpt('show_port_service',
default=False,
help=_('Controls whether or not to show service for'
'ports'))
]
CONF.register_opts(quark_view_opts, "QUARK")
@@ -176,9 +172,6 @@ def _port_dict(port, fields=None):
"device_id": port.get("device_id"),
"device_owner": port.get("device_owner")}
if CONF.QUARK.show_port_service:
res['service'] = port.get("service")
if "mac_address" in res and res["mac_address"]:
mac = str(netaddr.EUI(res["mac_address"])).replace('-', ':')
res["mac_address"] = mac