Merge "Refactoring config options for extension opts"

neutron/conf/extensions/allowedaddresspairs.py

@@ -0,0 +1,28 @@
+# Copyright 2013 VMware, Inc.  All rights reserved.
+#
+#    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.
+
+from oslo_config import cfg
+
+from neutron._i18n import _
+
+
+allowed_address_pair_opts = [
+    #TODO(limao): use quota framework when it support quota for attributes
+    cfg.IntOpt('max_allowed_address_pair', default=10,
+               help=_("Maximum number of allowed address pairs")),
+]
+
+
+def register_allowed_address_pair_opts(cfg=cfg.CONF):
+    cfg.register_opts(allowed_address_pair_opts)

neutron/extensions/allowedaddresspairs.py

@@ -22,14 +22,9 @@ import webob.exc
 from neutron._i18n import _
 from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
+from neutron.conf.extensions import allowedaddresspairs as addr_pair
 
-allowed_address_pair_opts = [
-    #TODO(limao): use quota framework when it support quota for attributes
-    cfg.IntOpt('max_allowed_address_pair', default=10,
-               help=_("Maximum number of allowed address pairs")),
-]
-
-cfg.CONF.register_opts(allowed_address_pair_opts)
+addr_pair.register_allowed_address_pair_opts()
 
 
 class AllowedAddressPairsMissingIP(nexception.InvalidInput):

neutron/opts.py

@@ -32,6 +32,7 @@ import neutron.conf.agent.dhcp
 import neutron.conf.agent.l3.config
 import neutron.conf.agent.ovs_conf
 import neutron.conf.common
+import neutron.conf.extensions.allowedaddresspairs
 import neutron.conf.plugins.ml2.drivers.linuxbridge
 import neutron.conf.quota
 import neutron.conf.service
@@ -47,7 +48,6 @@ import neutron.db.l3_dvr_db
 import neutron.db.l3_gwmode_db
 import neutron.db.l3_hamode_db
 import neutron.db.migration.cli
-import neutron.extensions.allowedaddresspairs
 import neutron.extensions.l3
 import neutron.extensions.securitygroup
 import neutron.plugins.ml2.config
@@ -101,7 +101,8 @@ def list_agent_opts():
 def list_extension_opts():
     return [
         ('DEFAULT',
-         neutron.extensions.allowedaddresspairs.allowed_address_pair_opts),
+         neutron.conf.extensions.allowedaddresspairs
+         .allowed_address_pair_opts),
         ('quotas',
          itertools.chain(
              neutron.conf.quota.l3_quota_opts,