diff --git a/networking_bgpvpn/policies/base.py b/networking_bgpvpn/policies/base.py deleted file mode 100644 index 463ec829..00000000 --- a/networking_bgpvpn/policies/base.py +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - - -# TODO(amotoki): Define these in neutron or neutron-lib -RULE_ADMIN_OR_OWNER = 'rule:admin_or_owner' -RULE_ADMIN_ONLY = 'rule:admin_only' -RULE_ANY = 'rule:regular_user' diff --git a/networking_bgpvpn/policies/bgpvpn.py b/networking_bgpvpn/policies/bgpvpn.py index e4862f41..0884231d 100644 --- a/networking_bgpvpn/policies/bgpvpn.py +++ b/networking_bgpvpn/policies/bgpvpn.py @@ -10,10 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import policy as base from oslo_policy import policy -from networking_bgpvpn.policies import base - rules = [ policy.DocumentedRuleDefault( diff --git a/networking_bgpvpn/policies/network_association.py b/networking_bgpvpn/policies/network_association.py index d79a8112..2185a155 100644 --- a/networking_bgpvpn/policies/network_association.py +++ b/networking_bgpvpn/policies/network_association.py @@ -10,10 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import policy as base from oslo_policy import policy -from networking_bgpvpn.policies import base - rules = [ policy.DocumentedRuleDefault( diff --git a/networking_bgpvpn/policies/port_association.py b/networking_bgpvpn/policies/port_association.py index 7689b0a5..4e3d87ee 100644 --- a/networking_bgpvpn/policies/port_association.py +++ b/networking_bgpvpn/policies/port_association.py @@ -10,10 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import policy as base from oslo_policy import policy -from networking_bgpvpn.policies import base - rules = [ policy.DocumentedRuleDefault( diff --git a/networking_bgpvpn/policies/router_association.py b/networking_bgpvpn/policies/router_association.py index 2d873ba7..251d8c1d 100644 --- a/networking_bgpvpn/policies/router_association.py +++ b/networking_bgpvpn/policies/router_association.py @@ -10,10 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib import policy as base from oslo_policy import policy -from networking_bgpvpn.policies import base - rules = [ policy.DocumentedRuleDefault(