Merge lp:~ibmcharmers/charms/trusty/was-base/devel into lp:~ibmcharmers/charms/trusty/was-base/trunk

[Geetha S]

=== modified file 'README.md'
--- README.md	2015-04-09 10:32:35 +0000
+++ README.md	2015-07-29 11:48:27 +0000
@@ -3,33 +3,37 @@
 WebSphere Application Server Base
 
 WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications.
-
-
-#Creating the repositories
+Details on IBM Websphere Application Server and WAS Base Prduct Page available [here] [WAS-product-page].
+
+
+# Usage
+
+Download your licensed IBM Installation Manager software version 1.5 and above for 'x86_64' based machine. And version 1.8 and above for 'ppc64le' based machine and upload to your apache repository.
+
+Download your licensed IBM Websphere Base software 8.5.5.0 version and upload to your apache repository.
+
+Download your licensed IBM Websphere Base software WAS fixpack version 8.5.5.4 and upload to your apache repository.
+
+For 'ppc64le' based machines, Download your licensed IBM Websphere Base software WAS fixpack version 8.5.5.6 and upload to your apache repository.
+
+Put up all the downloaded contents on the web server like Apache and configure apache to serve these packages. These packages can be accessed using a URL from the web server.
+
+
+#Creating the repositories in Apache
+
 Run steps below with admin access
 
 Install needed packages
     apt-get install dpkg-dev apache2
 
-Create the repository on apache server
-Under your apache repository directory
-    cd <apache-repository-directory>
-Configure apache server to allow access to the repository
-Configure config.yaml with the repository url
-	was_url: "http://<server-name>/debs/"
-
-# Usage
-Download your licensed IBM Installation Manager software version 1.5 and above and upload to your apache repository 
-
-Download your licensed IBM Websphere Base software 8.5.5.0 and upload to your apache repository 
-
-Download your licensed IBM Websphere Base software WAS fixpack version 8.5.5.4 version and upload to your apache repository 
-
-For WAS 8.5.5.0 Download refer : http://www-01.ibm.com/support/docview.wss?uid=swg27038625
-for WAS 8.5.5.4 fixpack download refer : http://www-01.ibm.com/support/docview.wss?uid=swg24038539 link
-
-To download and install the code contained in this charm you must agree to the 
-IBM license. The license file(s) can be found in the product binaries you downloaded.
+Create the repository on apache server Under your apache repository directory.
+Configure apache server to allow access to the repository.
+
+To install IBM Websphere Application Server Base you need to install IBM Installation Manager software as prerequisite.
+To install IBM Installation Manager you need to get the packages for ubuntu, for information about the software and builds please visit (http://www-01.ibm.com/software/passportadvantage/).
+
+To install the downloaded binaries you must agree to the IBM license. You can view the full license for IBM Installation Manager and IBM WebSphere Application Server Base by visiting the [Software license agreements search website][License] Search for "IBM Installation Manager" and "IBM Websphere Application Server" and choose the license that applies to the version you are using.
+
 
 Run the following to deploy this charm:
 
@@ -38,23 +42,20 @@
 At this point the charm will wait until the user accepts the license.  If you 
 agree to the license, run the following command:
 
-    juju set was-base accept-ibm-im-license=True
-    juju set was-base accept-ibm-websphere-license=True
-
-
-You can then browse to http://ip-address:9060 to view WAS Console. 
+If the was_url and im_filename is configured in the config.yaml:
+
+    juju set was-base accept-ibm-im-license=True accept-ibm-websphere-license=True
+
+If not,
+
+    juju set was-base accept-ibm-im-license=True accept-ibm-websphere-license=True was_url=<Web server URL> im_file_name=<IM package name> im_install_path=<IM Installation Path>
+
+
+You can then browse to "http://was-base unit's ip-address:9060/ibm/cinsole" to view WAS Console. 
+
 
 # Configuration
 
-`was_url`
-Apache Repository URL where WAS packages are placed
-
-`im_install_path`
-Installation Manager Installation Path
-
-`im_file_name`
-Installation Manager Package Name
-
 `accept-ibm-im-license`  
 The IBM Installation Manager software comes with special terms and conditions from IBM.
 The IBM Installation Manager software can only be used by accepting the terms and 
@@ -70,13 +71,82 @@
 Agreement for Non-Warranted Programs and additional license information.
 Please read the license agreement carefully.
 
-The license file can be found in the root directory of the charm source
-in the IBM-WebSphere-license.txt file
+Check the Usage section on getting the license agreement.
 
 **The WebSphere software cannot be installed until the terms and
 contions are accepted.  The charm will not function correctly until the
 this configuration option is set to True.**
 
-# Contact Information
+`was_url`
+The web server URL from which IBM IM, IBM WAS Base and fixpack packages can be downloaded.
+
+`im_install_path`
+Install Location for Installation Manager. Ex : "/opt/IBM/InstallationManager". Here IM will install at this location, It can be changed if IM needs to be installed at some other place.
+ 
+
+`im_file_name`
+The IBM Installation Manager Package name. If not set, It will assign the value "Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip" for x86_64 based machine and "agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip" for ppc64le based machine.
+
+`sha_im`
+Checksum value to check integrity of IBM Installation Manager package. The Charm uses sha1sum to check the integrity. If empty, it does not carry out the integrity check. Use `sha1sum <Package Location/Package Name> | cut -d" " -f1` to find out Checksum value for downloaded package. Cryptographic value should be altered by the user only when the package name is change. Else it should not be altered.
+
+#IBM WAS Base Information
+
+(1) General Information 
+Information on IBM WAS available [here] [WAS-Infocenter]
+
+(2) Download Information
+
+Downloadable Package Names for 'x86_64' based machine:
+WAS_V8.5.5_1_OF_3.zip
+WAS_V8.5.5_2_OF_3.zip
+WAS_V8.5.5_3_OF_3.zip
+8.5.5-WS-WAS-FP0000004-part1.zip
+8.5.5-WS-WAS-FP0000004-part2.zip
+
+Downloadable Package Names for 'ppc64le' based machine:
+WAS_V8.5.5_FOR_POWERLE_ML.zip
+WAS_V8.5.5_2_OF_2_FOR_POWERLE_ML.zip
+8.5.5-WS-WAS-LE-FP0000006-part1.zip
+8.5.5-WS-WAS-LE-FP0000006-part2.zip
+
+Information on procuring WAS product is available at the [Passport Advantage site] [Passport-Advantage]
+
+Details about WAS 8.5.5.0 download available [here] [[WAS-8.5.5.0-download]
+
+Information about insatllation of WAS Base on 'ppc64le' based machine available [here] [WAS-for-ppc64le]  
+
+Details about WAS 8.5.5.4 fixpack download available [here] [WAS-8.5.5.4-fixpack-download].
+
+A trial version is available [here] [WAS-trail-version].
+
+More information about IBM IM Downloadable file available [here] [IBM-IM-more-info]
+
+(3) Contact Information
 
 For issues with this charm, please contact [e-mail]
+
+<!-- Links -->
+
+[WAS-Infocenter]: http://www-01.ibm.com/support/knowledgecenter/SSAW57_8.5.5/as_ditamaps/was855_welcome_ndmp.html?lang=en
+
+[WAS-product-page]: http://www-03.ibm.com/software/products/en/appserv-was
+
+[WAS-8.5.5.0-download]: http://www-01.ibm.com/support/docview.wss?uid=swg27038625
+
+[WAS-8.5.5.4-fixpack-download]: http://www-01.ibm.com/support/docview.wss?uid=swg24038539
+
+[WAS-trail-version]: http://www.ibm.com/developerworks/downloads/ws/was/index.html
+
+[Passport-Advantage]: http://www-01.ibm.com/software/passportadvantage/
+
+[IBM-IM-more-info]: http://www-01.ibm.com/support/docview.wss?uid=swg24038380
+
+[WAS-for-ppc64le]: http://www-304.ibm.com/support/knowledgecenter/SSEQTP_8.5.5/com.ibm.websphere.installation.nd.doc/ae/cins_offerings.html?lang=en-us
+
+[WAS-pp64le-infocenter]: http://www-304.ibm.com/support/knowledgecenter/SSEQTP_8.5.5/com.ibm.websphere.installation.nd.doc/ae/tins_installation_dist_cl.html?lang=en
+
+[WAS-ppc64le-fixpack-info]: http://www-01.ibm.com/support/docview.wss?uid=swg24040035
+
+[License]: http://www-03.ibm.com/software/sla/sladb.nsf/search
+
 
=== modified file 'config.yaml'
--- config.yaml	2015-05-05 08:37:15 +0000
+++ config.yaml	2015-07-29 11:48:27 +0000
@@ -2,26 +2,46 @@
   was_url:
     type: string
     default: ""
-    description: "Download url for WAS packages"  
+    description: |
+        Download url for WAS Base packages, This is the URL containing WAS Base packages,
+        mention till the folder which contains packages  ex: http://<ip-address>/debs/WAS-BASE/.
   im_install_path:
     type: string
     default: "/opt/IBM/InstallationManager"
-    description: "Install Location for Installation Manager.Can be changed if IM needs to be installed at some other place"
+    description: |
+        Install Location for Installation Manager.Please enter the path 
+        where you wants to install Install Manager ex : /opt/IBM/InstallationManager 
+        here IM will install at this location, It can be changed if IM needs to be installed at some other place.
   im_file_name:
     type: string
-    default: Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip
-    description: "Installation Manager installable Name"
+    default: ""
+    description: |
+        Name of the IBM IM package. If not set, the Charm uses a predefined
+        package name for download from the url location. If the predefined
+        package is not available at url location or if set incorrectly,
+        the charm cannot install the IBM IM software.
   accept-ibm-websphere-license:
     type: boolean
     default: False 
     description: |
         The IBM WebSphere Application Server software comes with special terms and
         conditions from IBM.  The WebSphere software can only be used by 
-        accepting the license terms and conditions.
+        accepting the license terms and conditions. It should be set to "True" to install
+        the Websphere Application Server software.
   accept-ibm-im-license:
     type: boolean
     default: False 
     description: |
         The IBM Installation Manager software comes with special terms and
         conditions from IBM.  The Installation Manager software can only be used by
-        accepting the license  terms and conditions.
+        accepting the license  terms and conditions. It should be set to "True" to install
+        the IBM Installation Manager software.
+  sha_im:
+    type: string
+    default: ""
+    description: |
+        Checksum value to check integrity of IBM IM package. The Charm uses
+        sha1sum to check the integrity. For example, run the command: 
+        <sha1sum Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip | cut -d " " -f1> 
+        to get the checksum value for IBM Installation Manager pacakage.
+        If empty, it does not carry out the integrity check. 
 
=== modified file 'copyright'
--- copyright	2015-04-09 10:32:35 +0000
+++ copyright	2015-07-29 11:48:27 +0000
@@ -1,17 +1,13 @@
-Format: http://dep.debian.net/deps/dep5/
-
-Files: *
-Copyright: Copyright 2014, Canonical Ltd., All Rights Reserved.
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Copyright 2015 IBM Corporation
+
+This Charm is 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.
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-04-09 10:32:35 +0000
+++ hooks/config-changed	2015-07-29 11:48:27 +0000
@@ -1,17 +1,18 @@
 #!/bin/bash
 # config-changed occurs everytime a new configuration value is updated (juju set)
-
 set -e
 
 WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE
+ARCHIVE_DIR=files/archives
+
 # Check whether IM is installed
 is_im_installed()
 {
- if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
-     echo "True"
-  else
-     echo "False"
-  fi
+	if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
+		echo "True"
+	else
+		echo "False"
+	fi
 
 }
 
@@ -19,11 +20,11 @@
 # Check whether WAS BASE  is installed
 is_was_base_installed()
 {
- if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then
-     echo "True"
-  else
-     echo "False"
-  fi
+	if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then
+		echo "True"
+	else
+		echo "False"
+	fi
 
 }
 
@@ -32,27 +33,42 @@
 remove_was_base_software()
 {
 
-        was_base_installed=`is_was_base_installed`
-        if  [ $was_base_installed == True ]; then
-           juju-log "Removing WAS BASE Installation"
-           # Uninstalling WAS BASE
-           cd $IM_INSTALL_PATH/eclipse/tools
-           sudo ./imcl uninstall com.ibm.websphere.liberty.BASE.v85 -installationDirectory $WAS_BASE_INSTALL_PATH
-        fi
-        juju-log "Uninstalling WAS BASE software completed"
+	was_base_installed=`is_was_base_installed`
+	if  [ $was_base_installed == True ]; then
+		juju-log "IBM WAS Base: Removing WAS BASE Installation"
+		juju-log "IBM WAS Base: Server stopping"
+		$WAS_BASE_INSTALL_PATH/profiles/test/bin/stopServer.sh server1
+		if [ "$?" -ne "0" ]; then
+			juju-log "IBM WAS Base: Error while stopping the server"
+		else
+			juju-log "IBM WAS Base: Server stopped successfully"
+		fi
+
+	# Uninstalling WAS BASE
+		$IM_INSTALL_PATH/eclipse/tools/imcl uninstall com.ibm.websphere.BASE.v85 -installationDirectory $WAS_BASE_INSTALL_PATH
+		if [ -d /root/IBM/WebSphere/AppServer/V85/BASE ]; then
+			juju-log "IBM WAS Base: Removing installation directory"
+			cd /root
+			rm -rf IBM/WebSphere/AppServer/V85/BASE 
+		else
+			juju-log "IBM WAS Base: Installation directory does not exist"
+		fi
+		juju-log "IBM WAS Base: Uninstalling WAS Base software completed"
+
+	else
+		juju-log "IBM WAS Base: WAS Base software has not been installed."
+	fi
 }
 
 #Remove IM, if installed
 remove_im_software()
 {
-
-        im_installed=`is_im_installed`
-        if  [ $im_installed == True ]; then
-            juju-log "Removing IBM WebSphere IM software."
-            cd /root/var/ibm/InstallationManager/uninstall
-	#Uninstalling IM
-            ./uninstall --launcher.ini user-silent-uninstall.ini
-        fi
+	im_installed=`is_im_installed`
+	if [ $im_installed == True ]; then
+		juju-log "IBM WAS Base: Removing IBM IM software."
+		/root/var/ibm/InstallationManager/uninstall/uninstallc
+		juju-log "IBM WAS Base: Removed IBM IM software"
+	fi
 
 }
 
@@ -60,145 +76,350 @@
 remove_unaccepted_software()
 {
 
-   if  [ $1 == False ]; then
-       juju-log "Removing IBM WebSphere  (if installed) as the license agreement is not accepted."
-	 if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
-		juju-log "IM  exists "
-		remove_was_base_software 
-	 else
-		juju-log "IM  not exists and hence exiting from WAS unistalling"
-		exit 0 
-         fi
-   fi
-
-
-   if  [ $2 == False ]; then
-    juju-log "Removing IBM IM (if installed) as the license agreement is not accepted."
-
-	#Check any dependent products exists like WAS
-
-	 if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then
-		 juju-log "Can not uninstall IM as its has WAS product installed"
-		 exit 0 
-	 else
-		juju-log "Uninstall IM software"
-    		remove_im_software
-	fi
-   fi
-
-}
-
-
-juju-log "Websphere WAS BASE: Begin config-change hook"
+	if [ $1 == False ]; then
+		juju-log "IBM WAS Base: Removing IBM WebSphere  (if installed) as the license agreement is not accepted."
+		if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
+			juju-log "IBM WAS Base: IBM IM exists "
+			remove_was_base_software 
+		else
+			juju-log "IBM WAS Base: IBM IM does not exist and hence exiting from WAS uninstalling"
+			exit 0 
+		fi
+	fi
+	if [ $2 == False ]; then
+		juju-log "IBM WAS Base: Removing IBM IM (if installed) as the license agreement is not accepted."
+
+		#Check any dependent products exists like WAS
+
+		if [ -d $WAS_BASE_INSTALL_PATH/bin ]; then
+			juju-log "IBM WAS Base: Can not uninstall IM as it has WAS product installed"
+			exit 0
+		else
+			juju-log "IBM WAS Base: Uninstall IBM IM software"
+			remove_im_software
+		fi
+	fi
+
+}
+
+# Download IM Package
+
+download_IM(){
+#Exit if URL to download package is null
+	if [ "$WAS_URL" == "" ]; then
+		juju-log "IBM WAS Base: URL to download IBM WAS Base package is not configured."
+		exit 0
+	fi
+	
+	# If an install IM done, get the name of the package from which it was done
+	if [ -f  $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip ]; then 
+		im_pkg_name=`ls   $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip` 
+		if [ $? == 0 ]; then
+			im_pkg_name=`basename $im_pkg_name`
+		fi
+	fi
+	
+	# Get the package name to check whether the user wants to install a different package 
+	cfg_im_pkg_name=$im_file_name
+	
+	# Set package name to a predefined value if the user has not provided a package name
+	if [ "$cfg_im_pkg_name" == "" ]; then
+		if [ "$ARCHITECTURE" = "x86_64" ]; then
+			cfg_im_pkg_name="Install_Mgr_v1.6.2_Lnx_WASv8.5.5.zip"
+		elif [ "$ARCHITECTURE" = "ppc64le" ]; then
+			cfg_im_pkg_name="agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip"
+		else
+			juju-log "IBM WAS Base: Platform not supported for IM."
+			exit 1
+		fi
+	fi
+		
+	# The user has configured a different package name
+	if  [ "$im_pkg_name" != "$cfg_im_pkg_name" ]; then
+		set +e
+		#previously  downloaded and installed IM software
+		if [ "$im_pkg_name" != "" ]; then
+			juju-log "IBM WAS Base: Deleting the older IM package."
+			rm  -rf  $CHARM_DIR/$ARCHIVE_DIR/IM
+			remove_was_base_software
+			remove_im_software
+		fi
+		#Download the new IM package
+		juju-log "IBM WAS Base: Downloading IM package."
+		wget -t 2  -P  $CHARM_DIR/$ARCHIVE_DIR/IM $WAS_URL/$cfg_im_pkg_name
+		if [ $? == 0 ]; then
+			juju-log "IBM WAS Base: Downloaded IM package."
+		else
+			juju-log "IBM WAS Base: Download of IM package failed."
+			juju-log "IBM WAS Base: Ensure the download URL and package name are correctly set in the charm configuration."
+			exit 0
+		fi
+		set -e
+	fi
+	
+	# Check integrity of downloaded package 
+	SHA_IM=`config-get sha_im`
+	if [ "$SHA_IM" == "" ]; then
+		juju-log "IBM WAS Base: Ignored integrity check for IM package as sha_im checksum is null."
+	elif [ "$SHA_IM" != "`sha1sum $ARCHIVE_DIR/IM/$cfg_im_pkg_name | cut -d" " -f1`" ]; then
+		juju-log "IBM WAS Base: IBM IM package is corrupt."
+		exit 0
+	fi
+}
+
+#download WAS-Base
+
+download_WAS()
+{
+#Exit if URL to download package is null
+	if [ "$WAS_URL" == "" ]; then
+		juju-log "IBM WAS Base: URL to download IBM WAS Base package is not configured."
+		exit 0
+	else
+		juju-log "Downloading WAS Base Packages"
+		was_base_pkg1="WAS_V8.5.5_1_OF_3.zip"
+		was_base_pkg2="WAS_V8.5.5_2_OF_3.zip"
+		was_base_pkg3="WAS_V8.5.5_3_OF_3.zip"
+		was_base_fixpack1="8.5.5-WS-WAS-FP0000004-part1.zip"
+		was_base_fixpack2="8.5.5-WS-WAS-FP0000004-part2.zip"
+		was_base_ppc64le_pkg1="WAS_V8.5.5_FOR_POWERLE_ML.zip"
+		was_base_ppc64le_pkg2="WAS_V8.5.5_2_OF_2_FOR_POWERLE_ML.zip"
+		was_base_ppc64le_fixpack1="8.5.5-WS-WAS-LE-FP0000006-part1.zip"
+		was_base_ppc64le_fixpack2="8.5.5-WS-WAS-LE-FP0000006-part2.zip"
+		
+		if [ "$ARCHITECTURE" == "x86_64" ];then
+			if [ -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg2 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg3 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack2 ];then
+				juju-log " IBM WAS Base:Installing WAS Base, Downloaded packages already exists in archive directory."
+			else
+				wget -t 2 -P $CHARM_DIR/$ARCHIVE_DIR  $WAS_URL/$was_base_pkg1 $WAS_URL/$was_base_pkg2 $WAS_URL/$was_base_pkg3 $WAS_URL/$was_base_fixpack1 $WAS_URL/$was_base_fixpack2
+				if [ $? == 0 ]; then
+					juju-log "IBM WAS Base: Downloaded WAS Base packages successfully"
+				fi
+			fi
+		elif [ "$ARCHITECTURE" == "ppc64le" ];then
+			if [ -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_pkg1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_pkg2 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_fixpack1 -a -f $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_fixpack2 ];then
+				juju-log " IBM WAS Base:Installing WAS Base, Downloaded packages already exists in archive directory."
+			else
+				wget -t 2 -P $CHARM_DIR/$ARCHIVE_DIR  $WAS_URL/$was_base_ppc64le_pkg1 $WAS_URL/$was_base_ppc64le_pkg2 $WAS_URL/$was_base_ppc64le_fixpack1 $WAS_URL/$was_base_ppc64le_fixpack2
+				if [ $? == 0 ]; then
+					juju-log "IBM WAS Base: Downloaded WAS Base packages successfully"
+				fi
+		fi
+
+		fi
+	fi
+	
+	# Check integrity of downloaded package
+	if [ "$ARCHITECTURE" == "x86_64" ];then 
+		if [ "b9cc0b783b482de2092d5c387de05cda2e922413" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg1 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS package1 is corrupt."
+			exit 0
+		fi
+		if [ "74a52b1b5aaedd67c0727db90aff9dc63ff28f4e" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg2 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS package2 is corrupt."
+			exit 0
+		fi
+		if [ "e6943fa4a4a7a1384fad1faa54289106f0e57979" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_pkg3 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS package3 is corrupt."
+			exit 0
+		fi
+		if [ "895863b932334a78cccce6c73ec98d35ba98639b" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack1 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS Fix Pack part1 is corrupt."
+			exit 0
+		fi
+		if [ "8f8560746c6fb0f87cd47801a014e7c34fccc4cc" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_fixpack2 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS Fix Pack part2 is corrupt."
+			exit 0
+		fi
+	elif [ "$ARCHITECTURE" == "ppc64le" ];then
+		if [ "62cc5a2d23a2ff828d2b4dcd9ac754b3ff994292" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_pkg1 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS package1 is corrupt."
+			exit 0
+		fi
+		if [ "bc475ccd6f918bf858ccbb48d82e5adc2c7b3fa9" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_pkg2 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS package2 is corrupt."
+			exit 0
+		fi
+		if [ "c0f38a16b87b7e6e7c5c0f609fb3c1a61a3b7e8e" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_fixpack1 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS Fix Pack part1 is corrupt."
+			exit 0
+		fi
+		if [ "c8fe75b915fa2ecd183af208eff7df0464342ff8" != "`sha1sum  $CHARM_DIR/$ARCHIVE_DIR/$was_base_ppc64le_fixpack2 | cut -d" " -f1`" ]; then
+			juju-log "IBM WAS Base: IBM WAS Fix Pack part2 is corrupt."
+			exit 0
+		fi
+	fi
+
+}
+
+
+juju-log "IBM WAS BASE: Begin config-change hook"
 was_base_license_accepted=`config-get accept-ibm-websphere-license`
 im_license_accepted=`config-get accept-ibm-im-license`
 IM_INSTALL_PATH=`config-get im_install_path`
+WAS_URL=`config-get was_url`
+im_file_name=`config-get im_file_name`
+ARCHITECTURE=`uname -m`
 
 # Remove IM and WAS if license not accepted abase exit. Else install it
 remove_unaccepted_software $was_base_license_accepted $im_license_accepted
 if [ $im_license_accepted == False ]; then
-        juju-log "Websphere IM License not accepted."
+	juju-log "IBM WAS Base: Websphere IM License not accepted."
 
 elif [ $im_license_accepted == True ]; then
-
-        juju-log "License accepted"
-        im_inst=`is_im_installed`
-	if [ $im_inst == False ]; then	 
-		juju-log "IM installation start"
-	# Check IM package availability
-                        juju-log $CHARM_DIR
-                if [ -f  $CHARM_DIR/files/archives/IM/userinstc ];
-                then
-                        juju-log "IM Packages available for installation.";
-			cp  $CHARM_DIR/files/archives/IM/install.xml $CHARM_DIR/files/archives/IM/silent_install.xml
-			sed -i "2 a \<profile kind='self' installLocation='$IM_INSTALL_PATH' id='IBM Installation Manager'>\n <data key='eclipseLocation' value='$IM_INSTALL_PATH' />\n</profile>" $CHARM_DIR/files/archives/IM/silent_install.xml
-                         $CHARM_DIR/files/archives/IM/userinstc  -input  $CHARM_DIR/files/archives/IM/silent_install.xml -acceptlicense
-			 if [ $? == 0 ]
-                         then
-                               juju-log "IM Is installed successfully"
-                         else
-                               juju-log "Error while installing  IM"
-                               exit 1
-                         fi
-
-                else
-                        juju-log "IM Packages missing. Please check README file.";
-                        juju-log "Upgrade IM charm after adding the IM packages";
-                        exit 1
-                fi
-        fi
+	juju-log "IBM WAS Base: IBM IM License accepted"
+	download_IM
+	im_inst=`is_im_installed`
+	if [ $im_inst == False ]; then
+		if [ -f  $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip ]; then
+			juju-log "IBM WAS Base: downloading and extracting IM packages"
+			if [ -f  $CHARM_DIR/$ARCHIVE_DIR/IM/userinstc ]; then
+				juju-log "IBM WAS Base: IBM IM package contents extracted already."
+			else
+				unzip  $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip -d  $CHARM_DIR/$ARCHIVE_DIR/IM
+				if [  $? != 0 ]; then
+					juju-log "IBM WAS Base: Unable to extract the IM package content. Verify whether the package is corrupt."
+					# Remove corrupt archive file
+					rm  -f  $CHARM_DIR/$ARCHIVE_DIR/IM/*.zip
+					exit 0
+				fi
+			fi
+		fi
+		juju-log "IBM WAS Base: IM installation start"
+		# Check IM package availability
+		juju-log $CHARM_DIR/$ARCHIVE_DIR
+		if [ -f  $CHARM_DIR/$ARCHIVE_DIR/IM/userinstc ];
+		then
+
+			juju-log "IBM WAS Base: IM Packages available for installation."
+			cp $CHARM_DIR/$ARCHIVE_DIR/IM/install.xml $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml
+			sed -i "2 a \<profile kind='self' installLocation='$IM_INSTALL_PATH' id='IBM Installation Manager'>\n <data key='eclipseLocation' value='$IM_INSTALL_PATH' />\n</profile>" $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml
+			$CHARM_DIR/$ARCHIVE_DIR/IM/userinstc  -input  $CHARM_DIR/$ARCHIVE_DIR/IM/silent_install.xml -acceptlicense
+			if [ $? == 0 ]
+			then
+				juju-log "IBM WAS Base: IM Is installed successfully"
+			else
+				juju-log "IBM WAS Base: Error while installing  IM"
+				exit 1
+			fi
+
+		else
+			juju-log "IBM WAS Base: IM Packages missing. Please check README file"
+			juju-log "IBM WAS Base: Upgrade IM charm after adding the IM packages";
+			exit 1
+		fi
+	else
+		juju-log "IBM WAS Base: IBM IM Installed already using same package name."
+	fi
 else
-        juju-log " Acceptable values for license is 'True' or 'False'"
+	juju-log " IBM WAS Base: Acceptable values for license is 'True' or 'False'"
 
 fi
 
 if [ $was_base_license_accepted == False ]; then
-        juju-log "Websphere BASE License not accepted."
-
+	juju-log "IBM WAS Base: Websphere BASE License not accepted."
 elif [ $was_base_license_accepted == True ]; then
-       juju-log "Check WAS Base package availability"
-	# check WAS package availability
-	if [ -d "$CHARM_DIR/files/archives/disk1" ]; then	
-		 juju-log "WAS BASE Packages available for installation.";
-		#Check IM installation
-		 im_installed=`is_im_installed`
-                if  [ $im_installed == True ]; then
-		
-			 juju-log "Installing WAS BASE "
-			 cd $IM_INSTALL_PATH/eclipse/tools
-			 sudo ./imcl install com.ibm.websphere.BASE.v85 -repositories  $CHARM_DIR/files/archives/ -installationDirectory $WAS_BASE_INSTALL_PATH -sharedResourcesDirectory $IM_INSTALL_PATH/IMShared -acceptLicense -showProgress
-		  	if [ $? == 0 ]
-                  	then
-                               juju-log " WAS Base is installed successfully"
-                  	else
-                               juju-log "Error while installing  WAS"
-                               exit 1
-                  	fi
-		 else
-			juju-log "IM is not installaed to install WAS"
-			exit 0
-		 fi
-
-		juju-log "creating a profile"
-        	cd $WAS_BASE_INSTALL_PATH/bin
-		#sh does not work in ubuntu so linking to bash
-
-		juju-log "Unlink /bin/sh"
-		sudo unlink /bin/sh
- 		sudo ln -s /bin/bash /bin/sh
-		juju-log "creating a profile"
-
-		juju-log "updating /etc/hosts with hostname"
-		# Need to update hostname in /etc/hosts
-		private_address=`unit-get private-address`
-		juju-log "private_address : $private_address"
-		echo "$private_address `hostname`" >> /etc/hosts
- 		if [ $? == 0 ]
-		then	
-        		juju-log "hostname updated"
- 		else
-        		juju-log "Error while updating /etc/hosts"
-		fi
-
-		sudo  ./manageprofiles.sh -create -profileName "test" -profilePath "$WAS_BASE_INSTALL_PATH/profiles/test" -templatePath "$WAS_BASE_INSTALL_PATH/profileTemplates/default/" -nodeName "node1" -cellName "cell1" -serverName "server1" -adminUserName "wasadmin" -adminPassword "wasadmin"
-		juju-log "Profile creation completed"	
-
-		#Apply fixpack 8.5.5.4 to upgrade was base version from 8.5.5.0 to 8.5.5.4
-		
-		juju-log "Upgrading WAS Base"
-		cd $IM_INSTALL_PATH/eclipse/tools	
-		sudo ./imcl  install com.ibm.websphere.BASE.v85_8.5.5004.20141119_1746 -repositories  $CHARM_DIR/files/archives/was_fixpack/  -installationDirectory $WAS_BASE_INSTALL_PATH -sharedResourcesDirectory $IM_INSTALL_PATH/IMShared -acceptLicense -showProgress
-		  if [ $? == 0 ]
-                  then
-                               juju-log " WAS fixpack installed successfully"
-                  else
-                               juju-log "Error while installing  WAS fixpack"
-                               exit 1
-                  fi
-
+	juju-log "IBM WAS Base: Check WAS Base package availability"
+	is_was_base_installed=`is_was_base_installed`
+	if [ $is_was_base_installed ==  False ];then
+		download_WAS
+		if [ -d "$CHARM_DIR/$ARCHIVE_DIR/disk1" ];then
+			juju-log "IBM WAS Base: Installing WAS Base, unzipped package contents aavailable"
+		else
+			unzip $CHARM_DIR/$ARCHIVE_DIR/'WAS_*.zip' -d $CHARM_DIR/$ARCHIVE_DIR/
+			if [  $? != 0 ]; then
+				juju-log "IBM WAS Base: Unable to extract the WAS packages content. Verify whether the package is corrupt."
+				# Remove corrupt archive file
+				rm  -f $CHARM_DIR/$ARCHIVE_DIR/'WAS_*.zip'
+				exit 0
+			else
+				juju-log "IBM WAS Base: Downloaded and Extracted WAS Base Packages Sucessfully"
+			fi
+		fi
+		if [ -d  $CHARM_DIR/$ARCHIVE_DIR/was_fixpack ];then
+			juju-log "IBM WAS Base: WAS Base Fixpack packages are available for upgrading"
+		else
+			unzip $CHARM_DIR/$ARCHIVE_DIR/'8.5.5-WS-WAS*.zip' -d $CHARM_DIR/$ARCHIVE_DIR/was_fixpack/
+			if [  $? != 0 ]; then
+				juju-log "IBM WAS Base: Unable to extract the WAS Base fixpack packages content. Verify whether the package is corrupt."
+				# Remove corrupt archive file
+				rm  -f $CHARM_DIR/$ARCHIVE_DIR/8.5.5-WS-WAS*.zip
+				exit 0
+			else
+				juju-log "IBM WAS Base: Downloaded and Extracted WAS Base fixpack Packages Sucessfully"
+			fi
+		fi
+		# check WAS package availability
+		if [ -d "$CHARM_DIR/$ARCHIVE_DIR/disk1" ]; then	
+			juju-log "IBM WAS Base: WAS BASE Packages available for installation.";
+			#Check IM installation
+			im_installed=`is_im_installed`
+			if  [ $im_installed == True ]; then
+				juju-log "IBM WAS Base: Installing WAS BASE "
+				if [ "$ARCHITECTURE" == "x86_64" ];then
+					$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.v85 -acceptLicense -repositories  $CHARM_DIR/$ARCHIVE_DIR/ -installationDirectory $WAS_BASE_INSTALL_PATH  -showProgress
+					if [ $? == 0 ];
+					then
+						juju-log " IBM WAS Base: WAS Base is installed successfully"
+					else
+						juju-log "IBM WAS Base: Error while installing WAS"
+						exit 1
+					fi
+				elif [ "$ARCHITECTURE" == "ppc64le" ];then
+					$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.le.v85 -acceptLicense -repositories  $CHARM_DIR/$ARCHIVE_DIR/ -installationDirectory $WAS_BASE_INSTALL_PATH  -showProgress
+					if [ $? == 0 ];
+					then
+						juju-log " IBM WAS Base: WAS Base is installed successfully"
+					else
+						juju-log "IBM WAS Base: Error while installing WAS"
+						exit 1
+					fi
+
+				fi
+			else
+				juju-log "IBM WAS Base: IM needs to be installed before installing WAS."
+				exit 0
+			fi
+			juju-log "IBM WAS Base: creating a profile"
+			#sh does not work in ubuntu so linking to bash
+			juju-log "IBM WAS Base: Unlink /bin/sh"
+			unlink /bin/sh
+			ln -s /bin/bash /bin/sh
+			juju-log "IBM WAS Base: creating a profile"
+			$WAS_BASE_INSTALL_PATH/bin/manageprofiles.sh -create -profileName "test" -profilePath "$WAS_BASE_INSTALL_PATH/profiles/test" -templatePath "$WAS_BASE_INSTALL_PATH/profileTemplates/default" -nodeName "node1" -cellName "cell1" -serverName "server1" -adminUserName "wasadmin" -adminPassword "wasadmin"
+			juju-log "IBM WAS Base: Profile creation completed"	
+			#Apply fixpack 8.5.5.4 to upgrade was base version from 8.5.5.0 to 8.5.5.4
+			juju-log "IBM WAS Base: Upgrading WAS Base by installing WAS fixpack"	
+			if [ "$ARCHITECTURE" == "x86_64" ];then
+				$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.v85_8.5.5004.20141119_1746 -repositories $CHARM_DIR/files/archives/was_fixpack -installationDirectory $WAS_BASE_INSTALL_PATH  -acceptLicense -showProgress
+			elif [ "$ARCHITECTURE" == "ppc64le" ];then
+				$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.BASE.le.v85_8.5.5006.20150529_0614 -repositories $CHARM_DIR/files/archives/was_fixpack -installationDirectory $WAS_BASE_INSTALL_PATH  -acceptLicense -showProgress
+			fi
+			if [ $? == 0 ];
+			then
+				juju-log " IBM WAS Base: WAS fixpack installed successfully"
+			else
+				juju-log "IBM WAS Base: Error while installing WAS fixpack"
+				exit 1
+			fi
+			#starting the server
+			cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/
+			juju-log "IBM WAS Base: Server Starting"
+			./startServer.sh server1
+			if [ "$?" -ne "0" ]; then
+				juju-log "IBM WAS Base: Error while starting the server"
+			else
+				juju-log "IBM WAS Base: Server started successfully"
+			fi
+	
+
+		else
+			juju-log "IBM WAS Base: WAS BASE Packages are not available"
+		fi
 	else
-		juju-log "WAS BASE Packages are not available "
+		juju-log "IBM WAS Base: IBM WAS Base Software installed already"
 	fi
-
+else
+	juju-log "IBM WAS Base: Acceptable values for license is 'True' or 'False'"
 fi
-
+juju-log "IBM WAS Base: End Config-Changed hook..."
 
=== modified file 'hooks/install'
--- hooks/install	2015-04-09 10:32:35 +0000
+++ hooks/install	2015-07-29 11:48:27 +0000
@@ -2,46 +2,22 @@
 # Here do anything needed to install the service
 
 set -e
-juju-log "Downloading WAS Installable"
-was_repository=`config-get was_url`
-im_file_name=`config-get im_file_name`
-juju-log "repository : $was_repository"
-if [ -z "$was_repository" ];then
-juju-log "Please enter Repository URL in config.yaml"
-fi
-
-if [ -z "$im_file_name" ];then
-	juju-log "Please enter IM Installation path or IM package Name"
-fi
-juju-log "Downloading and extracting WAS packages"
-sudo apt-get install unzip
-	juju-log "downloading and extracting IM packages"
-	cd $CHARM_DIR/files/archives
-	mkdir IM
-	cd IM
-	wget  $was_repository/$im_file_name
-	unzip $im_file_name
-
-cd $CHARM_DIR/files/archives
-wget  $was_repository/WAS_V8.5.5_1_OF_3.zip
-wget  $was_repository/WAS_V8.5.5_2_OF_3.zip
-wget  $was_repository/WAS_V8.5.5_3_OF_3.zip
-
-#installing unzip  packages 
-unzip WAS_V8.5.5_1_OF_3.zip
-unzip WAS_V8.5.5_2_OF_3.zip
-unzip WAS_V8.5.5_3_OF_3.zip
-
-
-juju-log "Downloading and extracting WAS fixpack images"
-#Downloading was fixpack packages
-cd $CHARM_DIR/files/archives
-mkdir was_fixpack
-cd was_fixpack
-wget  $was_repository/8.5.5-WS-WAS-FP0000004-part1.zip
-wget  $was_repository/8.5.5-WS-WAS-FP0000004-part2.zip
-
-#Extracting the packages
-unzip 8.5.5-WS-WAS-FP0000004-part1.zip 
-unzip 8.5.5-WS-WAS-FP0000004-part2 
-juju-log "WAS Installables download complete"
+juju-log "IBM WAS Base: Begin Install."
+
+# Install wget 
+juju-log "IBM WAS Base: Downloading and installng wget package"
+apt-get install -y wget 
+juju-log "IBM WAS Base: wget downloaded and installed."
+
+#Install unzip
+juju-log "IBM WAS Base: Downloading and installng unzip."
+apt-get install -y unzip
+juju-log "IBM WAS Base: unzip  downloaded and installed."
+
+ARCHITECTURE=`uname -m`
+if [ "$ARCHITECTURE" != "x86_64" -a  "$ARCHITECTURE" != "ppc64le" ]; then
+     juju-log "IBM WAS Base: Unsupported platform. IBM WAS Base installed with this Charm supports only the x86_64 and ppc64le platforms."
+     exit 1
+fi
+
+juju-log "IBM WAS Base: End Install."
 
=== modified file 'hooks/start'
--- hooks/start	2015-04-09 10:32:35 +0000
+++ hooks/start	2015-07-29 11:48:27 +0000
@@ -2,14 +2,24 @@
 WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE
 
 #starting the server
-cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/
-sudo  ./startServer.sh server1
-                if [ "$?" -ne "0" ]; then
-                        juju-log "Error while starting the server"
-                else
-                        juju-log "Server started successfully"
-
-                fi
+#server_status=` ps -ef | grep '$WAS_BASE_INSTALL_PATH'`
+netstat -nltp | grep 9060 
+if [ "$?" -eq "0" ];then
+     juju-log "IBM WAS Base: WAS Base Server already started"
+else
+    if [ -d $WAS_BASE_INSTALL_PATH/profiles/test/bin ]; then
+          cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/
+          ./startServer.sh server1
+          if [ "$?" -ne "0" ]; then
+                juju-log "IBM WAS Base: Error while starting the server"
+          else
+                juju-log "IBM WAS Base: Server started successfully"
+          fi
+    else
+          juju-log "IBM WAS Base: No server to start, exiting."
+          exit 0
+    fi
+fi
 
 open-port 9060
 open-port 9443
 
=== modified file 'hooks/stop'
--- hooks/stop	2015-04-09 10:32:35 +0000
+++ hooks/stop	2015-07-29 11:48:27 +0000
@@ -3,10 +3,17 @@
 set -e
 WAS_BASE_INSTALL_PATH=/root/IBM/WebSphere/AppServer/V85/BASE
 
-cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/
- sudo  ./stopServer.sh server1
-                if [ "$?" -ne "0" ]; then
-                        juju-log "Error while stoping the server"
-                else
-                        juju-log "Server stopped successfully"
-                fi
+if [ -d $WAS_BASE_INSTALL_PATH/profiles/test/bin ]; then
+      cd $WAS_BASE_INSTALL_PATH/profiles/test/bin/
+      ./stopServer.sh server1
+      if [ "$?" -ne "0" ]; then
+            juju-log "Error while stoping the server"
+      else
+            juju-log "Server stopped successfully"
+      fi
+else
+      juju-log "IBM WAS Base: No server to stop, exiting."
+      exit 0
+fi
+close-port 9060
+close-port 9443
 
=== added file 'hooks/website-relation-changed'
--- hooks/website-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-changed	2015-07-29 11:48:27 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+relation-set hostname=`unit-get private-address` port=9060 https-port=9443
+
 
=== added file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-joined	2015-07-29 11:48:27 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+juju-log "IBM WAS Base: Begin website-relation-joined hook." 
+set -e
+was_base_license_accepted=`config-get accept-ibm-websphere-license`
+if [ "$was_base_license_accepted" == "False" ]; then
+	juju-log "IBM WAS Base: IBM WAS Base License is not accepted."
+	juju-log "Delete the relation. Accept the IBM WAS Base License, as per the README, before setting up any relation."
+	exit 0
+fi
+relation-set hostname=`unit-get private-address` port=9060 https-port=9443
+juju-log "IBM WAS Base: End website-relation-joined hook."
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-04-09 10:32:35 +0000
+++ metadata.yaml	2015-07-29 11:48:27 +0000
@@ -1,6 +1,6 @@
 name: was-base
 summary: WebSphere Application Server Base Edition
-maintainer: [e-mail]
+maintainer: IBM Juju Support Team <[e-mail]> 
 description: |
  WebSphere Application Server is a proven, high-performance transaction engine that can help build, run, integrate, and manage dynamic web applications.
 tags: ["applications"]
 
=== removed file 'revision'
--- revision	2015-04-09 10:32:35 +0000
+++ revision	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1
 
=== modified file 'tests/00-setup'
--- tests/00-setup	2015-04-17 07:55:57 +0000
+++ tests/00-setup	2015-07-29 11:48:27 +0000
@@ -1,5 +1,17 @@
 #!/bin/bash
+# ATTENTION: ib_url must contain the repository with
+#            your IB packages
+WAS_URL=${WAS_URL?Error: IBM WAS Base repository must be defined in tests/00-setup}
+IM_FILE_NAME=${IM_FILE_NAME?Error: IBM IM package be defined in tests/00-setup}
+
+# Add a local configuration file
+sudo cat << EOF > local.yaml
+wasbase:
+        was_url: "$WAS_URL"
+        im_file_name: "$IM_FILE_NAME"
+EOF
 
 sudo add-apt-repository ppa:juju/stable -y
 sudo apt-get update
 sudo apt-get install amulet python3-requests -y
+
 
=== modified file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2015-04-17 07:55:57 +0000
+++ tests/10-bundles-test.py	2015-07-29 11:48:27 +0000
@@ -6,38 +6,57 @@
 import unittest
 import yaml
 import amulet
+import sys
 import requests
 
 # Lots of prereqs on this charm (eg: java), so give it a large timeout
 seconds_to_wait = 2400
 
-
 class BundleTest(unittest.TestCase):
-    """ Create a class for testing the charm in the unit test framework. """
     @classmethod
     def setUpClass(cls):
-        """ Set up an amulet deployment using the bundle. """
-        d = amulet.Deployment()
-        bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
-        with open(bundle_path, 'r') as bundle_file:
+         d = amulet.Deployment()
+
+         local_path = os.path.join(os.path.dirname(__file__), 'local.yaml')
+         with open(local_path, "r") as fd:
+            config = yaml.safe_load(fd)
+
+         url = config.get('wasbase').get('was_url')
+         print('Using URL  %s' % url)
+         # Test if a IB url for the repository is defined
+         if not url:
+            print("You need to define a url for the WAS Base packages repository.\n"
+                  "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+
+         pkg = config.get('wasbase').get('im_file_name')
+         print('Using IBM IM package %s' % pkg)
+         if not pkg:
+            print("You need to define a package name for IBM IM.\n"
+                  "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+
+         bundle_path = os.path.join(os.path.dirname(__file__), 'bundles.yaml')
+         with open(bundle_path, 'r') as bundle_file:
             contents = yaml.safe_load(bundle_file)
-            d.load(contents)
+         d.load(contents)
 
-        # Software doesn't actually install until you accept the license
-        d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True })
-        d.setup(seconds_to_wait)
-        cls.d = d
+         # Software doesn't actually install until you accept the license
+         d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
+         d.setup(seconds_to_wait)
+         d.sentry.wait(seconds_to_wait)
+         cls.d = d
 
     def test_deployed(self):
-        """ Test to see if the bundle deployed successfully. """
-        self.assertTrue(self.d.deployed)
+         self.assertTrue(self.d.deployed)
 
     def test_website(self):
-        unit = self.d.sentry.unit['was-base/0']
-        url  = 'http://%s:9060/ibm/console' % unit.info['public-address']
-        response = requests.get(url)
+         unit = self.d.sentry.unit['was-base/0']
+         url  = 'http://%s:9060/ibm/console' % unit.info['public-address']
+         response = requests.get(url)
         # Raise an exception if the url was not a valid web page.
-        response.raise_for_status()
+         response.raise_for_status()
 
 if __name__ == '__main__':
     unittest.main()
+