x/kloudbuster
Code Issues Proposed changes

Enhance the flavor pick-up logic

Browse Source 
1. Enhance the flavor pick-up logic;
2. Fix the force_cleanup script to be safer to run on production cloud;

Change-Id: I737f7fd5fcea31be06d4347d91740ac4de65b8db
This commit is contained in:
Yichen Wang 2015-10-18 01:33:07 -07:00
parent 92b5280ef0
commit 1121f33c7d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kloudbuster/force_cleanup.sh
View File

@ -97,7 +97,7 @@ for line in $KEYPAIR_LIST; do
nova keypair-delete "$line"
done;
if [ "$FLOATINGIP_LIST" == "" ]; then
if [ "$FLOATINGIP_LIST" == "" ] && [ "$1" == "" ]; then
echo -e "`neutron floatingip-list | grep -E '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+'`" | while read line; do
fid=`echo $line | cut -d'|' -f2 | xargs`
portid=`echo $line | cut -d'|' -f5 | xargs`

23
kloudbuster/users.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import sys
import base_compute
import base_network
from cinderclient.v2 import client as cinderclient
@ -135,17 +137,24 @@ class User(object):
def check_resources_quota(self):
# Flavor check
flavor_manager = base_compute.Flavor(self.nova_client)
flavor_to_use = None
find_flag = False
fcand = {'vcpus': sys.maxint, 'ram': sys.maxint, 'disk': sys.maxint}
for flavor in flavor_manager.list():
flavor = vars(flavor)
if flavor['vcpus'] < 1 or flavor['ram'] < 1024 or flavor['disk'] < 10:
continue
flavor_to_use = flavor
break
if flavor_to_use:
LOG.info('Automatically selects flavor %s to instantiate VMs.' %
(flavor_to_use['name']))
self.tenant.kloud.flavor_to_use = flavor_to_use['name']
if flavor['vcpus'] < fcand['vcpus']:
fcand = flavor
if flavor['vcpus'] == fcand['vcpus'] and flavor['ram'] < fcand['ram']:
fcand = flavor
if flavor['vcpus'] == fcand['vcpus'] and flavor['ram'] == fcand['ram'] and\
flavor['disk'] < fcand['disk']:
fcand = flavor
find_flag = True
if find_flag:
LOG.info('Automatically selects flavor %s to instantiate VMs.' % fcand['name'])
self.tenant.kloud.flavor_to_use = fcand['name']
else:
LOG.error('Cannot find a flavor which meets the minimum '
'requirements to instantiate VMs.')