image builder is not giving error for invalid service type

[shweta]

1. Use incorrect service type for kickstart command

/trove-integration/scripts$ ./redstack kick-start root

2. It should giving proper error like "root is not a valid service_type" but is not giving correct error.

*******************************************************************************
Building an image for use with development and integration tests.
*******************************************************************************
*******************************************************************************
Actually building the image, this can take up to 15 minutes
*******************************************************************************
/home/ubuntu/.ssh already exists
Keyfile already exists in authorized_keys - skipping
+ true
+ case "$1" in
+ shift
+ break
+ export DIB_IMAGE_CACHE=/home/ubuntu/trove-integration/scripts//.cache/image-create
+ DIB_IMAGE_CACHE=/home/ubuntu/trove-integration/scripts//.cache/image-create
+ '[' '' = 1 -a /home/ubuntu/trove-integration/scripts/ '!=' '' ']'
+ source /opt/stack/diskimage-builder/bin/../lib/img-defaults
++ source /opt/stack/diskimage-builder/bin/../lib/common-defaults
+++ '[' -f /etc/debian_version ']'
++++ dpkg --print-architecture
+++ _ARCH=amd64
+++ ARCH=amd64
+++ export ARCH
+++ export DIB_NO_TMPFS=0
+++ DIB_NO_TMPFS=0
+++ export DIB_MIN_TMPFS=2
+++ DIB_MIN_TMPFS=2
+++ _BASE_ELEMENT_DIR=/opt/stack/diskimage-builder/bin/../elements
+++ ELEMENTS_PATH=/home/ubuntu/trove-integration/scripts/files/elements:/opt/stack/tripleo-image-elements/elements:/opt/stack/diskimage-builder/bin/../elements
+++ export ELEMENTS_PATH=/home/ubuntu/trove-integration/scripts/files/elements:/opt/stack/tripleo-image-elements/elements:/opt/stack/diskimage-builder/bin/../elements
+++ ELEMENTS_PATH=/home/ubuntu/trove-integration/scripts/files/elements:/opt/stack/tripleo-image-elements/elements:/opt/stack/diskimage-builder/bin/../elements
+++ export DIB_OFFLINE=
+++ DIB_OFFLINE=
+++ [[ :/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games =~ :/sbin ]]
+++ [[ :/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games =~ :/usr/sbin ]]
+++ [[ :/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games =~ :/usr/local/sbin ]]
++ FS_TYPE=ext4
++ IMAGE_TYPE=qcow2
++ IMAGE_NAME=/home/ubuntu/images/ubuntu_root/ubuntu_root
+ source /opt/stack/diskimage-builder/bin/../lib/common-functions
++ _DISPLAYED_FIRST_BOOT_DEPRECATED=0
+ source /opt/stack/diskimage-builder/bin/../lib/img-functions
+ '[' 0 == 1 ']'
+ arg_to_elements ubuntu vm heat-cfntools ubuntu-guest ubuntu-root
+ for arg in '"$@"'
+ IMAGE_ELEMENT=' ubuntu'
+ for arg in '"$@"'
+ IMAGE_ELEMENT=' ubuntu vm'
+ for arg in '"$@"'
+ IMAGE_ELEMENT=' ubuntu vm heat-cfntools'
+ for arg in '"$@"'
+ IMAGE_ELEMENT=' ubuntu vm heat-cfntools ubuntu-guest'
+ for arg in '"$@"'
+ IMAGE_ELEMENT=' ubuntu vm heat-cfntools ubuntu-guest ubuntu-root'
+ '[' '' '!=' 1 ']'
+ IMAGE_ELEMENT='base ubuntu vm heat-cfntools ubuntu-guest ubuntu-root'
+ '[' 0 == 1 ']'
+ echo 'Building elements: base ubuntu vm heat-cfntools ubuntu-guest ubuntu-root'
Building elements: base ubuntu vm heat-cfntools ubuntu-guest ubuntu-root
++ /opt/stack/diskimage-builder/bin/element-info --expand-dependencies base ubuntu vm heat-cfntools ubuntu-guest ubuntu-root
ERROR: Element 'ubuntu-root' not found in '/home/ubuntu/trove-integration/scripts/files/elements:/opt/stack/tripleo-image-elements/elements:/opt/stack/diskimage-builder/bin/../elements'
+ IMAGE_ELEMENT=

[Openstack Gerrit (openstack-gerrit)]

Fix proposed to branch: master
Review: https://review.openstack.org/92058

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/92058
Committed: https://git.openstack.org/cgit/openstack/trove-integration/commit/?id=8bd8227fa406ccdc24a4a9d18b9a0e840f118444
Submitter: Jenkins
Branch: master

commit 8bd8227fa406ccdc24a4a9d18b9a0e840f118444
Author: shalini khandelwal <email address hidden>
Date: Fri May 23 04:28:24 2014 +0000

    Corrected conditional check for invalid SERVICE_TYPE

    Check for invalid SERVICE_TYPE returning FALSE,
    as it is using "SERVICE" in place of "SERVICE_TYPE".

    Change-Id: Ifed9ace1a9e060d972282784bec931d2a511b51f
    Closes-Bug: #1316010