x/tuskar
Code Issues Proposed changes

Removed unnecessary nova client

Browse Source 
Change-Id: Ie82672412271460bfc92d4383c8f60749e53725c
This commit is contained in:
Jay Dobies 2014-02-20 13:24:18 -05:00
parent 13faf8b889
commit d606f467d6
3 changed files with 1 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/tuskar/tuskar.conf.sample
View File

@ -68,14 +68,6 @@
#policy_default_rule=default
#
# Options defined in tuskar.compute.nova
#
# nova overcloud keystone uri and credentials (string value)
#nova_overcloud_config=/etc/tuskar/nova_overcloud_config.yml
#
# Options defined in tuskar.db.sqlalchemy.models
#
@ -543,4 +535,4 @@
#ringfile=/etc/oslo/matchmaker_ring.json
# Total option count: 110
# Total option count: 109

0
tuskar/compute/__init__.py
View File

102
tuskar/compute/nova.py
View File

@ -1,102 +0,0 @@
# Copyright 2013 Red Hat # 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.
#
import yaml
from novaclient.v1_1 import client
from oslo.config import cfg
#from tuskar.common import exception
#from tuskar.openstack.common import jsonutils
from tuskar.openstack.common import log
nova_opts = [
cfg.StrOpt('nova_overcloud_config',
default='/etc/tuskar/nova_overcloud_config.yml',
help='nova overcloud keystone uri and credentials'),
]
LOG = log.getLogger(__name__)
CONF = cfg.CONF
CONF.register_opts(nova_opts)
class NovaClient(object):
def __init__(self):
#grab client params from nova_overcloud_config.yml:
try:
config_file = open(CONF.nova_overcloud_config)
client_params = yaml.safe_load(config_file)
config_file.close()
except Exception:
raise
self.nova_client = client.Client(client_params['nova_username'],
client_params['nova_password'],
client_params['nova_tenantname'],
client_params['keystone_url'],
service_type="compute")
def get_flavors(self):
"""Calls out to Nova for a list of detailed flavor information."""
try:
flavors = self.nova_client.flavors.list()
except Exception:
raise
#should convert response to some local Flavor object - controller/db?
#TODO() ^^^ FIXME - right now we aren't using this method
return flavors
#returns newly created flavor uuid from nova
def create_flavor(self, flavor_data, rc_name):
try:
ram, cpu, disk, ephemeral, swap = \
self.extract_from_capacities(flavor_data)
name = "%s.%s" % (rc_name, flavor_data.name)
nova_flavor = self.nova_client.flavors.create(name, ram, cpu, disk)
return nova_flavor.id
except Exception as e:
if ("Instance Type with name %s already exists" % (name,)) \
in e.message:
for flav in self.get_flavors():
if flav.name == name:
return flav.id
else:
raise
def delete_flavor(self, nova_flavor_id):
try:
self.nova_client.flavors.delete(nova_flavor_id)
except Exception as e:
if ("%s could not be found" % (nova_flavor_id)) in e.message:
return True
else:
raise
return True
def extract_from_capacities(self, flavor_data):
ram = cpu = root_disk = ephemeral = swap = 0
for c in flavor_data.capacities:
if c.name in ["memory", "ram"]:
ram = c.value
elif c.name in ["cpu", "vcpu"]:
cpu = c.value
elif c.name in ["storage", "root_disk"]:
root_disk = c.value
elif c.name in ["ephemeral_disk", "ephemeral"]:
ephemeral = c.value
elif c.name in ["swap", "swap_disk"]:
swap = c.value
return ram, cpu, root_disk, ephemeral, swap