x/quark
Code Issues Proposed changes

Moved ip_availability into the package

Browse Source 
flake8 fixes

RM7008
This commit is contained in:
Amir Sadoughi
2014-11-16 01:14:35 -06:00
parent 73abb6f64c
commit eea8184e09
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/ip_availability → quark/ip_availability.py
View File

@@ -13,20 +13,18 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo.config import cfg from collections import defaultdict
import json
import sys
import netaddr
from neutron.common import config from neutron.common import config
from neutron.db import api as neutron_db_api from neutron.db import api as neutron_db_api
from oslo.config import cfg
from quark.db import models
from sqlalchemy import and_, or_, func from sqlalchemy import and_, or_, func
from sqlalchemy.sql.expression import text from sqlalchemy.sql.expression import text
from collections import defaultdict from quark.db import models
import json
import netaddr
import sys
def main(): def main():
@@ -44,7 +42,7 @@ def main():
def _rackspace_filter(query): def _rackspace_filter(query):
# NOTE(asadoughi): should be moved to config? # NOTE(asadoughi): should be moved to config?
query = query.filter(or_(models.Subnet.do_not_use == None, query = query.filter(or_(models.Subnet.do_not_use == None, # noqa
models.Subnet.do_not_use == 0)) models.Subnet.do_not_use == 0))
public_network_id = "00000000-0000-0000-0000-000000000000" public_network_id = "00000000-0000-0000-0000-000000000000"
query = query.filter(models.Subnet.network_id == public_network_id) query = query.filter(models.Subnet.network_id == public_network_id)
@@ -78,7 +76,7 @@ def get_used_ips(session):
query = query.outerjoin( query = query.outerjoin(
models.IPAddress, models.IPAddress,
and_(models.Subnet.id == models.IPAddress.subnet_id, and_(models.Subnet.id == models.IPAddress.subnet_id,
or_(models.IPAddress._deallocated == None, or_(models.IPAddress._deallocated == None, # noqa
models.IPAddress._deallocated == 0, models.IPAddress._deallocated == 0,
func.now() < func.date_add( func.now() < func.date_add(
models.IPAddress.deallocated_at, window)))) models.IPAddress.deallocated_at, window))))
@@ -92,7 +90,7 @@ def get_used_ips(session):
# NOTE(asadoughi): (address is allocated) OR # NOTE(asadoughi): (address is allocated) OR
# (address is deallocated and not inside subnet's IP policy) # (address is deallocated and not inside subnet's IP policy)
query = query.filter(or_( query = query.filter(or_(
models.IPAddress._deallocated == None, models.IPAddress._deallocated == None, # noqa
models.IPAddress._deallocated == 0, models.IPAddress._deallocated == 0,
models.IPPolicyCIDR.id == None)) models.IPPolicyCIDR.id == None))
@@ -128,7 +126,3 @@ def get_unused_ips(session, used_ips_counts):
ret[tenant_id] -= used_ips_counts[tenant_id] ret[tenant_id] -= used_ips_counts[tenant_id]
return ret return ret
if __name__ == "__main__":
main()

5
setup.cfg
View File

@@ -20,12 +20,9 @@ classifier =
setup-hooks = setup-hooks =
pbr.hooks.setup_hook pbr.hooks.setup_hook
[files]
scripts =
bin/ip_availability
[entry_points] [entry_points]
console_scripts = console_scripts =
quark-db-manage = quark.db.migration.cli:main quark-db-manage = quark.db.migration.cli:main
gunicorn-neutron-server = quark.gunicorn_server:main gunicorn-neutron-server = quark.gunicorn_server:main
quark-agent = quark.agent.agent:main quark-agent = quark.agent.agent:main
ip_availability = quark.ip_availability:main