openstack/neutron-lib
Code Issues Proposed changes

[FWaaS] Migrate Public attribute to Shared

Browse Source 
This patch is the first in the series of patches which
tracks the migration of Public attribute to shared in
FWaaS v2.

Change-Id: I0be5fca27c9696714ba8b91de2098448c5a18265
Partial-Bug: #1676922
This commit is contained in:
Reedip 2017-03-29 07:44:44 +00:00 committed by Reedip
parent 24ea6f3529
commit a0d6f5a1ae
19 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api-ref/source/v2/fwaas-v2.inc
View File

@ -78,7 +78,7 @@ Response Parameters
- name: firewall_group_name-body-required
- ports: firewall_group_ports-body-required
- project_id: project_id-body-required
- public: firewall_group_shared-body-required
- shared: firewall_group_shared-body-required
- status: firewall_group_status-body-required
- tenant_id: project_id-body-required
@ -124,7 +124,7 @@ Response Parameters
- name: firewall_group_name-body-required
- ports: firewall_group_ports-body-required
- project_id: project_id-body-required
- public: firewall_group_shared-body-required
- shared: firewall_group_shared-body-required
- status: firewall_group_status-body-required
- tenant_id: project_id-body-required
@ -164,7 +164,7 @@ Request
- name: firewall_group_name-body-optional
- ports: firewall_group_ports-body-optional
- project_id: project_id-body-optional
- public: firewall_group_shared-body-optional
- shared: firewall_group_shared-body-optional
- status: firewall_group_status-body-optional
- tenant_id: project_id-body-optional
@ -188,7 +188,7 @@ Response Parameters
- name: firewall_group_name-body-required
- ports: firewall_group_ports-body-required
- project_id: project_id-body-required
- public: firewall_group_shared-body-required
- shared: firewall_group_shared-body-required
- status: firewall_group_status-body-required
- tenant_id: project_id-body-required
@ -224,6 +224,7 @@ Request
- ingress_firewall_policy_id: ingress_firewall_policy_id-body-optional
- name: firewall_group_name-body-optional
- ports: firewall_group_ports-body-optional
- shared: firewall_group_shared-body-optional
- status: firewall_group_status-body-optional
Request Example
@ -246,7 +247,7 @@ Response Parameters
- name: firewall_group_name-body-required
- ports: firewall_group_ports-body-required
- project_id: project_id-body-required
- public: firewall_group_shared-body-required
- shared: firewall_group_shared-body-required
- status: firewall_group_status-body-required
- tenant_id: project_id-body-required
@ -317,7 +318,7 @@ Response Parameters
- firewall_rules: firewall_rules-body-required
- name: firewall_policy_name-body-required
- project_id: project_id-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- tenant_id: project_id-body-required
Response Example
@ -355,7 +356,7 @@ Response Parameters
- id: firewall_policy_id-body-required
- name: firewall_policy_name-body-required
- project_id: project_id-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- tenant_id: project_id-body-required
Response Example
@ -386,7 +387,7 @@ Request
- firewall_rules: firewall_rules-body-optional
- name: firewall_policy_name-body-optional
- project_id: project_id-body-optional
- public: firewall_policy_shared-body-optional
- shared: firewall_policy_shared-body-optional
- tenant_id: project_id-body-optional
Request Example
@ -407,7 +408,7 @@ Response Parameters
- id: firewall_policy_id-body-required
- name: firewall_policy_name-body-required
- project_id: project_id-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- tenant_id: project_id-body-required
Response Example
@ -439,7 +440,7 @@ Request
- firewall_rules: firewall_rules-body-optional
- name: firewall_policy_name-body-optional
- project_id: project_id-body-optional
- public: firewall_policy_shared-body-optional
- shared: firewall_policy_shared-body-optional
- tenant_id: project_id-body-optional
Request Example
@ -459,7 +460,7 @@ Response Parameters
- firewall_rules: firewall_rules-body-required
- id: firewall_policy_id-body-required
- name: firewall_policy_name-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- project_id: project_id-body-required
- tenant_id: project_id-body-required
@ -535,7 +536,7 @@ Response Parameters
- name: firewall_rule_name-body-required
- project_id: project_id-body-required
- protocol: firewall_rule_protocol-body-required
- public: firewall_rule_shared-body-required
- shared: firewall_rule_shared-body-required
- source_ip_address: firewall_rule_source_ip_address-body-required
- source_port: firewall_rule_source_port-body-required
- tenant_id: project_id-body-required
@ -585,7 +586,7 @@ Response Parameters
- name: firewall_rule_name-body-required
- project_id: project_id-body-required
- protocol: firewall_rule_protocol-body-required
- public: firewall_rule_shared-body-required
- shared: firewall_rule_shared-body-required
- source_ip_address: firewall_rule_source_ip_address-body-required
- source_port: firewall_rule_source_port-body-required
- tenant_id: project_id-body-required
@ -622,7 +623,7 @@ Request
- name: firewall_rule_name-body-optional
- project_id: project_id-body-optional
- protocol: firewall_rule_protocol-body-optional
- public: firewall_rule_shared-body-optional
- shared: firewall_rule_shared-body-optional
- source_ip_address: firewall_rule_source_ip_address-body-optional
- source_port: firewall_rule_source_port-body-optional
- tenant_id: project_id-body-optional
@ -650,7 +651,7 @@ Response Parameters
- name: firewall_rule_name-body-required
- project_id: project_id-body-required
- protocol: firewall_rule_protocol-body-required
- public: firewall_rule_shared-body-required
- shared: firewall_rule_shared-body-required
- source_ip_address: firewall_rule_source_ip_address-body-required
- source_port: firewall_rule_source_port-body-required
- tenant_id: project_id-body-required
@ -689,7 +690,7 @@ Request
- name: firewall_rule_name-body-optional
- project_id: project_id-body-optional
- protocol: firewall_rule_protocol-body-optional
- public: firewall_rule_shared-body-optional
- shared: firewall_rule_shared-body-optional
- source_ip_address: firewall_rule_source_ip_address-body-optional
- source_port: firewall_rule_source_port-body-optional
- tenant_id: project_id-body-optional
@ -717,7 +718,7 @@ Response Parameters
- name: firewall_rule_name-body-required
- project_id: project_id-body-required
- protocol: firewall_rule_protocol-body-required
- public: firewall_rule_shared-body-required
- shared: firewall_rule_shared-body-required
- source_ip_address: firewall_rule_source_ip_address-body-required
- source_port: firewall_rule_source_port-body-required
- tenant_id: project_id-body-required
@ -791,7 +792,7 @@ Response Parameters
- id: firewall_policy_id-body-required
- name: firewall_policy_name-body-required
- project_id: project_id-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- tenant_id: project_id-body-required
Response Example
@ -836,7 +837,7 @@ Response Parameters
- id: firewall_policy_id-body-required
- name: firewall_policy_name-body-required
- project_id: project_id-body-required
- public: firewall_policy_shared-body-required
- shared: firewall_policy_shared-body-required
- tenant_id: project_id-body-required
Response Example

2
api-ref/source/v2/samples/firewall-v2/firewall-group-create-response.json
View File

@ -10,7 +10,7 @@
"650bfd2f-7766-4a0d-839f-218f33e16998"
],
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"public": true,
"shared": true,
"status": "PENDING_CREATE",
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"
}

2
api-ref/source/v2/samples/firewall-v2/firewall-group-show-response.json
View File

@ -7,7 +7,7 @@
"ingress_firewall_policy_id": null,
"name": "",
"project_id": "96108b04417b416e9b9bc788c11c42c9",
"public": false,
"shared": false,
"status": "INACTIVE",
"tenant_id": "96108b04417b416e9b9bc788c11c42c9"
}

1
api-ref/source/v2/samples/firewall-v2/firewall-group-update-response.json
View File

@ -9,6 +9,7 @@
"ports": [
"650bfd2f-7766-4a0d-839f-218f33e16998"
],
"shared": true,
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"status": "PENDING_UPDATE",
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"

1
api-ref/source/v2/samples/firewall-v2/firewall-groups-list-response.json
View File

@ -10,6 +10,7 @@
"ports": [
"650bfd2f-7766-4a0d-839f-218f33e16998"
],
"shared": true,
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"status": "ACTIVE",
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"

2
api-ref/source/v2/samples/firewall-v2/firewall-policies-list-response.json
View File

@ -9,7 +9,7 @@
"id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
"name": "test-policy",
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"public": false,
"shared": false,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"
}
]

2
api-ref/source/v2/samples/firewall-v2/firewall-policy-create-response.json
View File

@ -8,7 +8,7 @@
"id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
"name": "test-policy",
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"public": false,
"shared": false,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"
}
}

2
api-ref/source/v2/samples/firewall-v2/firewall-policy-insert-rule-response.json
View File

@ -6,7 +6,7 @@
],
"id": "c9e15d6e-b6ba-4ef4-8715-985d1f100467",
"name": "policy2",
"public": false,
"shared": false,
"project_id": "95573613ec554b4b8df9f2679c64557b",
"tenant_id": "95573613ec554b4b8df9f2679c64557b"
}

2
api-ref/source/v2/samples/firewall-v2/firewall-policy-remove-rule-response.json
View File

@ -5,6 +5,6 @@
"id": "c9e15d6e-b6ba-4ef4-8715-985d1f100467",
"name": "policy2",
"project_id": "95573613ec554b4b8df9f2679c64557b",
"public": false,
"shared": false,
"tenant_id": "95573613ec554b4b8df9f2679c64557b"
}

2
api-ref/source/v2/samples/firewall-v2/firewall-policy-show-response.json
View File

@ -8,7 +8,7 @@
"id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
"name": "test-policy",
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"public": false,
"shared": false,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"
}
}

2
api-ref/source/v2/samples/firewall-v2/firewall-policy-update-response.json
View File

@ -9,7 +9,7 @@
"id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
"name": "test-policy",
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"public": false,
"shared": false,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"
}
}

2
api-ref/source/v2/samples/firewall-v2/firewall-rule-create-response.json
View File

@ -10,7 +10,7 @@
"name": "rule3",
"project_id": "95573613ec554b4b8df9f2679c64557b",
"protocol": null,
"public": false,
"shared": false,
"source_ip_address": null,
"source_port": null,
"tenant_id": "95573613ec554b4b8df9f2679c64557b"

2
api-ref/source/v2/samples/firewall-v2/firewall-rule-show-response.json
View File

@ -12,7 +12,7 @@
"position": null,
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"protocol": "tcp",
"public": false,
"shared": false,
"source_ip_address": null,
"source_port": null,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"

2
api-ref/source/v2/samples/firewall-v2/firewall-rule-update-request.json
View File

@ -1,5 +1,5 @@
{
"firewall_rule": {
"public": "true"
"shared": true
}
}

2
api-ref/source/v2/samples/firewall-v2/firewall-rule-update-response.json
View File

@ -12,7 +12,7 @@
"position": 1,
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"protocol": "tcp",
"public": true,
"shared": true,
"source_ip_address": null,
"source_port": null,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"

2
api-ref/source/v2/samples/firewall-v2/firewall-rules-list-response.json
View File

@ -13,7 +13,7 @@
"position": 1,
"project_id": "45977fa2dbd7482098dd68d0d8970117",
"protocol": "tcp",
"public": false,
"shared": false,
"source_ip_address": null,
"source_port": null,
"tenant_id": "45977fa2dbd7482098dd68d0d8970117"

6
neutron_lib/api/definitions/firewall_v2.py
View File

@ -62,7 +62,7 @@ RESOURCE_ATTRIBUTE_MAP = {
'firewall_policy_id': {'allow_post': False, 'allow_put': False,
'validate': {'type:uuid_or_none': None},
'is_visible': True},
'public': {'allow_post': True, 'allow_put': True,
'shared': {'allow_post': True, 'allow_put': True,
'default': False, 'is_visible': True,
'convert_to': converters.convert_to_boolean,
'required_by_policy': True, 'enforce_policy': True},
@ -116,7 +116,7 @@ RESOURCE_ATTRIBUTE_MAP = {
'convert_to': converters.convert_to_boolean},
'status': {'allow_post': False, 'allow_put': False,
'is_visible': True},
'public': {'allow_post': True, 'allow_put': True, 'default': False,
'shared': {'allow_post': True, 'allow_put': True, 'default': False,
'convert_to': converters.convert_to_boolean,
'is_visible': True, 'required_by_policy': True,
'enforce_policy': True},
@ -157,7 +157,7 @@ RESOURCE_ATTRIBUTE_MAP = {
'validate': {'type:string':
db_const.DESCRIPTION_FIELD_SIZE},
'is_visible': True, 'default': ''},
'public': {'allow_post': True, 'allow_put': True, 'default': False,
'shared': {'allow_post': True, 'allow_put': True, 'default': False,
'convert_to': converters.convert_to_boolean,
'is_visible': True, 'required_by_policy': True,
'enforce_policy': True},

2
neutron_lib/tests/unit/api/definitions/test_firewall_v2.py
View File

@ -23,5 +23,5 @@ class FirewallDefinitionTestCase(base.DefinitionBaseTestCase):
'egress_firewall_policy_id', 'enabled',
'firewall_policy_id', 'firewall_rules',
'ingress_firewall_policy_id', 'ip_version',
'ports', 'position', 'protocol', 'public',
'ports', 'position', 'protocol', 'shared',
'source_ip_address', 'source_port')

6
releasenotes/notes/migrate-public-to-shared-0c67b32f9c37c751.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
FWaaS has renamed the ``public`` attribute to ``shared`` to be
in-sync with Openstack nomenclature based on the functionality
the ``shared`` attribute provides.