Merge "fix javelin to let you specify imgdir"
diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index 1d46028..19e816b 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -192,7 +192,9 @@
self.check_users()
self.check_objects()
self.check_servers()
- self.check_volumes()
+ # TODO(sdague): Volumes not yet working, bring it back once the
+ # code is self testing.
+ # self.check_volumes()
def check_users(self):
"""Check that the users we expect to exist, do.
@@ -284,6 +286,12 @@
#######################
+def _resolve_image(image, imgtype):
+ name = image[imgtype]
+ fname = os.path.join(OPTS.devstack_base, image['imgdir'], name)
+ return name, fname
+
+
def create_images(images):
for image in images:
client = client_for_user(image['owner'])
@@ -297,20 +305,23 @@
# special handling for 3 part image
extras = {}
if image['format'] == 'ami':
+ name, fname = _resolve_image(image, 'aki')
r, aki = client.images.create_image(
- 'javelin_' + image['aki'], 'aki', 'aki')
- client.images.store_image(aki.get('id'), open(image['aki'], 'r'))
+ 'javelin_' + name, 'aki', 'aki')
+ client.images.store_image(aki.get('id'), open(fname, 'r'))
extras['kernel_id'] = aki.get('id')
+ name, fname = _resolve_image(image, 'ari')
r, ari = client.images.create_image(
- 'javelin_' + image['ari'], 'ari', 'ari')
- client.images.store_image(ari.get('id'), open(image['ari'], 'r'))
+ 'javelin_' + name, 'ari', 'ari')
+ client.images.store_image(ari.get('id'), open(fname, 'r'))
extras['ramdisk_id'] = ari.get('id')
+ _, fname = _resolve_image(image, 'file')
r, body = client.images.create_image(
image['name'], image['format'], image['format'], **extras)
image_id = body.get('id')
- client.images.store_image(image_id, open(image['file'], 'r'))
+ client.images.store_image(image_id, open(fname, 'r'))
#######################
@@ -407,8 +418,10 @@
create_objects(RES['objects'])
create_images(RES['images'])
create_servers(RES['servers'])
- create_volumes(RES['volumes'])
- attach_volumes(RES['volumes'])
+ # TODO(sdague): volumes definition doesn't work yet, bring it
+ # back once we're actually executing the code
+ # create_volumes(RES['volumes'])
+ # attach_volumes(RES['volumes'])
def get_options():
@@ -423,6 +436,11 @@
required=True,
metavar='resourcefile.yaml',
help='Resources definition yaml file')
+ parser.add_argument(
+ '-d', '--devstack-base',
+ required=True,
+ metavar='/opt/stack/old',
+ help='Devstack base directory for retrieving artifacts')
# auth bits, letting us also just source the devstack openrc
parser.add_argument('--os-username',
metavar='<auth-user-name>',
diff --git a/tempest/cmd/resources.yaml b/tempest/cmd/resources.yaml
index a1f567b..3450e1f 100644
--- a/tempest/cmd/resources.yaml
+++ b/tempest/cmd/resources.yaml
@@ -27,6 +27,7 @@
images:
- name: javelin_cirros
owner: javelin
+ imgdir: files/images/cirros-0.3.2-x86_64-uec
file: cirros-0.3.2-x86_64-blank.img
format: ami
aki: cirros-0.3.2-x86_64-vmlinuz