openstack-attic/melange
Code Issues Proposed changes

misc changes after rebase from master while moving from bzr

Browse Source
This commit is contained in:
Rajaram Mallya 2011-10-07 10:07:11 +05:30
parent f0c8627e9b
commit f773f6678f
6 changed files with 9 additions and 58 deletions

3
Authors

@ -32,6 +32,7 @@ Dave Walker <DaveWalker@ubuntu.com>
David Pravec <David.Pravec@danix.org>
David Subiros <david.perez5@hp.com>
Dean Troyer <dtroyer@gmail.com>
Deepak N <deepak.n@thoughtworks.com>
Devendra Modium <dmodium@isi.edu>
Devin Carlen <devin.carlen@gmail.com>
Donal Lafferty <donal.lafferty@citrix.com>
@ -95,6 +96,7 @@ Naveed Massjouni <naveedm9@gmail.com>
Nikolay Sokolov <nsokolov@griddynamics.com>
Nirmal Ranganathan <nirmal.ranganathan@rackspace.com>
Paul Voccio <paul@openstack.org>
Rajaram Mallya <rajarammallya@gmail.com>
Renuka Apte <renuka.apte@citrix.com>
Ricardo Carrillo Cruz <emaildericky@gmail.com>
Rick Clark <rick@openstack.org>
@ -117,6 +119,7 @@ Trey Morris <trey.morris@rackspace.com>
Troy Toman <troy.toman@rackspace.com>
Tushar Patil <tushar.vitthal.patil@gmail.com>
Vasiliy Shlykov <vash@vasiliyshlykov.org>
Vinkesh Banka <vinkeshb@thoughtworks.com>
Vishvananda Ishaya <vishvananda@gmail.com>
Vivek Y S <vivek.ys@gmail.com>
Vladimir Popovski <vladimir@zadarastorage.com>

40
melange/ipam/scheduler.py

@ -1,40 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# 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.
"""
SQLAlchemy models for Melange data
"""
from apscheduler.scheduler import Scheduler
from melange.ipam.models import IpAddress
class ScheduledJobs(object):
def __init__(self):
self.scheduler = Scheduler()
def start(self):
self.scheduler.start()
self.scheduler.add_interval_job(
IpAddress.delete_deallocated_addresses, seconds=10)
def stop(self):
self.scheduler.shutdown(0)
def running(self):
print self.scheduler.dump_jobs()

1
run_tests.sh

@ -88,6 +88,7 @@ function run_pep8 {
srcfiles=`find bin -type f ! -name "nova.conf*"`
srcfiles+=" `find tools/*`"
srcfiles+=" nova setup.py plugins/xenserver/xenapi/etc/xapi.d/plugins/glance"
srcfiles+=" bin melange"
# Just run PEP8 in current environment
#
# NOTE(sirp): W602 (deprecated 3-arg raise) is being ignored for the

2
tools/install_venv.py

@ -1,6 +1,8 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2010 United States Government as represented by the
# Administrator of the National Aeronautics and Space Administration.
# All Rights Reserved.
#
# Copyright 2010 OpenStack, LLC

4
tools/pip-requires

@ -21,7 +21,7 @@ wsgiref==0.1.2
mox==0.5.3
greenlet==0.3.1
nose
PasteDeploy
PasteDeploy>=1.5
paste
sqlalchemy-migrate
netaddr
@ -34,3 +34,5 @@ coverage
nosexcover
paramiko
feedparser
webtest
factory_boy

17
tools/with_venv.sh

@ -1,21 +1,4 @@
#!/bin/bash
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack LLC.
# 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.
TOOLS=`dirname $0`
VENV=$TOOLS/../.nova-venv
source $VENV/bin/activate && $@