Merge lp:~seyeongkim/charms/trusty/neutron-api/lp1386911 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[Seyeong Kim]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1559 neutron-api-next for xtrusia mp248474
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1559/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1514 neutron-api-next for xtrusia mp248474
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1514/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1637 neutron-api-next for xtrusia mp248474
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10046614/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1637/

[Liam Young (gnuoy)]

Thanks for this mp Seyeong Kim, this is a great addition to the charm functionality. One small thing, please could you add quota support to the kilo template as well ? I think that the kilo template probably landed after you submitted this mp, so apologies for that.

review: Needs Fixing

[Seyeong Kim (seyeongkim)]

new options added to kilo

do i need to add this also in config.yaml and neutron.conf for kilo templates?

quota_firewall = 1
quota_firewall_policy = 1
quota_firewall_rule = 100

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1948 neutron-api-next for xtrusia mp249468
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1948/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1738 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1738/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1889 neutron-api-next for xtrusia mp249468
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10186189/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1889/

[lp:~seyeongkim/charms/trusty/neutron-api/lp1386911]

78. By Seyeong Kim on 2015-02-24

rebase 1

79. By Seyeong Kim on 2015-02-24

rebase 2

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2204 neutron-api-next for xtrusia mp249468
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2204/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1993 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1993/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2150 neutron-api-next for xtrusia mp249468
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10396288/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2150/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-13 14:43:04 +0000
+++ config.yaml	2015-02-24 11:28:29 +0000
@@ -66,6 +66,71 @@
         gre
         vxlan 
       .
+  # Quota configuration settings
+  quota-security-group:
+    default: 10
+    type: int
+    description: |
+      Number of security groups allowed per tenant. A negative value means
+      unlimited.
+  quota-security-group-rule:
+    default: 100
+    type: int
+    description: |
+      Number of security group rules allowed per tenant. A negative value means
+      unlimited
+  quota-network:
+    default: 10
+    type: int
+    description: |
+      Number of networks allowed per tenant. A negative value means unlimited.
+  quota-subnet:
+    default: 10
+    type: int
+    description: |
+      Number of subnets allowed per tenant. A negative value means unlimited.
+  quota-port:
+    default: 50
+    type: int
+    description: |
+      Number of ports allowed per tenant. A negative value means unlimited.
+  quota-vip:
+    default: 10
+    type: int
+    description: |
+      Number of vips allowed per tenant. A negative value means unlimited.
+  quota-pool:
+    default: 10
+    type: int
+    description: |
+      Number of pools allowed per tenant. A negative value means unlimited.
+  quota-member:
+    default: -1
+    type: int
+    description: |
+      Number of pool members allowed per tenant. A negative value means unlimited.
+      The default is unlimited because a member is not a real resource consumer
+      on Openstack. However, on back-end, a member is a resource consumer
+      and that is the reason why quota is possible.
+  quota-health-monitors:
+    default: -1
+    type: int
+    description: |
+      Number of health monitors allowed per tenant. A negative value means
+      unlimited.
+      The default is unlimited because a health monitor is not a real resource
+      consumer on Openstack. However, on back-end, a member is a resource consumer
+      and that is the reason why quota is possible.
+  quota-router:
+    default: 10
+    type: int
+    description: |
+      Number of routers allowed per tenant. A negative value means unlimited.
+  quota-floatingip: 
+    default: 50
+    type: int
+    description: |
+      Number of floating IPs allowed per tenant. A negative value means unlimited.
   # HA configuration settings
   vip:
     type: string

=== modified file 'hooks/neutron_api_context.py'
--- hooks/neutron_api_context.py	2014-11-25 10:19:07 +0000
+++ hooks/neutron_api_context.py	2015-02-24 11:28:29 +0000
@@ -98,6 +98,19 @@
         ctxt['neutron_bind_port'] = \
             determine_api_port(api_port('neutron-server'),
                                singlenode_mode=True)
+        ctxt['quota_security_group'] = config('quota-security-group')
+        ctxt['quota_security_group_rule'] = \
+            config('quota-security-group-rule')
+        ctxt['quota_network'] = config('quota-network')
+        ctxt['quota_subnet'] = config('quota-subnet')
+        ctxt['quota_port'] = config('quota-port')
+        ctxt['quota_vip'] = config('quota-vip')
+        ctxt['quota_pool'] = config('quota-pool')
+        ctxt['quota_member'] = config('quota-member')
+        ctxt['quota_health_monitors'] = config('quota-health-monitors')
+        ctxt['quota_router'] = config('quota-router')
+        ctxt['quota_floatingip'] = config('quota-floatingip')
+
         for rid in relation_ids('neutron-api'):
             for unit in related_units(rid):
                 rdata = relation_get(rid=rid, unit=unit)

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2014-10-22 16:31:29 +0000
+++ templates/icehouse/neutron.conf	2015-02-24 11:28:29 +0000
@@ -50,7 +50,20 @@
 quota_driver = neutron.db.quota_db.DbQuotaDriver
 {% if neutron_security_groups -%}
 quota_items = network,subnet,port,security_group,security_group_rule
+quota_security_group = {{ quota_security_group }}
+quota_security_group_rule = {{ quota_security_group_rule }}
+{% else -%}
+quota_items = network,subnet,port
 {% endif -%}
+quota_network = {{ quota_network }}
+quota_subnet = {{ quota_subnet }} 
+quota_port = {{ quota_port }}
+quota_vip = {{ quota_vip }}
+quota_pool = {{ quota_pool }}
+quota_member = {{ quota_member }}
+quota_health_monitors = {{ quota_health_monitors }}
+quota_router = {{ quota_router }}
+quota_floatingip = {{ quota_floatingip }}
 
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf

=== modified file 'templates/kilo/neutron.conf'
--- templates/kilo/neutron.conf	2015-01-20 14:15:55 +0000
+++ templates/kilo/neutron.conf	2015-02-24 11:28:29 +0000
@@ -50,7 +50,20 @@
 quota_driver = neutron.db.quota_db.DbQuotaDriver
 {% if neutron_security_groups -%}
 quota_items = network,subnet,port,security_group,security_group_rule
+quota_security_group = {{ quota_security_group }}
+quota_security_group_rule = {{ quota_security_group_rule }}
+{% else -%}
+quota_items = network,subnet,port
 {% endif -%}
+quota_network = {{ quota_network }}
+quota_subnet = {{ quota_subnet }} 
+quota_port = {{ quota_port }}
+quota_vip = {{ quota_vip }}
+quota_pool = {{ quota_pool }}
+quota_member = {{ quota_member }}
+quota_health_monitors = {{ quota_health_monitors }}
+quota_router = {{ quota_router }}
+quota_floatingip = {{ quota_floatingip }}
 
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf

=== modified file 'unit_tests/test_neutron_api_context.py'
--- unit_tests/test_neutron_api_context.py	2015-01-13 14:43:04 +0000
+++ unit_tests/test_neutron_api_context.py	2015-02-24 11:28:29 +0000
@@ -157,6 +157,17 @@
             'verbose': True,
             'l2_population': True,
             'overlay_network_type': 'gre',
+            'quota_floatingip': 50,
+            'quota_health_monitors': -1,
+            'quota_member': -1,
+            'quota_network': 10,
+            'quota_pool': 10,
+            'quota_port': 50,
+            'quota_router': 10,
+            'quota_security_group': 10,
+            'quota_security_group_rule': 100,
+            'quota_subnet': 10,
+            'quota_vip': 10,
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):
@@ -175,6 +186,17 @@
             'verbose': True,
             'l2_population': True,
             'overlay_network_type': 'vxlan',
+            'quota_floatingip': 50,
+            'quota_health_monitors': -1,
+            'quota_member': -1,
+            'quota_network': 10,
+            'quota_pool': 10,
+            'quota_port': 50,
+            'quota_router': 10,
+            'quota_security_group': 10,
+            'quota_security_group_rule': 100,
+            'quota_subnet': 10,
+            'quota_vip': 10,
         }
         napi_ctxt = context.NeutronCCContext()
         with patch.object(napi_ctxt, '_ensure_packages'):