Merge lp:~salmavar/charms/trusty/ibm-im/ibm-im-branch into lp:~ibmcharmers/charms/trusty/ibm-im/devel

[Shruthima]

[lp:~salmavar/charms/trusty/ibm-im/ibm-im-branch]

2. By Shruthima on 2016-04-27

Modified README and reactive files

=== modified file 'README.md'
--- README.md	2016-04-22 11:21:50 +0000
+++ README.md	2016-04-27 12:12:01 +0000
@@ -1,175 +1,211 @@
-## Charm for IBM Installation Manager(IM) 1.8
-
-### Overview
-
-IBM Installation Manager
-
-IBM® Installation Manager is a single installation program that uses remote or local software repositories to install, modify, or update certain IBM products.
-
-User guides and security guides to support this release are available for
-Online viewing [User Guide](http://www.ibm.com/support/knowledgecenter/SSDV2W/im_family_welcome.html)
-
-
-### Download of Product Binaries 
-
-Download your licensed IBM IM 1.8 software for Ubuntu.
-
-You can download product binaries from
-[Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142)
-
-
-### Usage
-Download your licensed IBM Installation Manager software and host it.
-
-Curl-url and Curl-opts are two main options we are using from ibm-base-layer to download the ibm product as IBM-IM is built on top of the IBM-Base-Layer [More Info](http://interfaces.juju.solutions/layer/ibm-base/)
-
-To download and install the code contained in this charm you must agree to the IBM license. 
-
-You can view the full license for `IBM Installation Manager`by visiting the [license-info](http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/39AFC1C1D485C4E085257E7300548B05?OpenDocument).
-
-Search for "IBM Installation Manager" and choose the license that applies to the version you are using.
-
-##### For (x86_64) Ubuntu , The packages are:
-
-IBM Installation Manager 1.8 (agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip)
-
-##### For Power (ppcle) Ubuntu, The packages are:
-
-IBM Installation Manager 1.8(agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip)
-
-Creating Repositories
---------------------
-For deploying IBM IM charm the user needs to download the correct packages as mentioned in the 'Usage' section above and host it so that the IBM IM charm can connect to the host server and deploy the same. The host server can be any Ubuntu machine and the package needs to be kept in the path like `/home/charm/repository/<productname>`. The path where the package is kept is a configurable item and needs to be set before deploying the charm.
-
-
-### Deploy
-
-1.Run the following commands to deploy this charm:
-
-	      juju deploy ibm-im
-2.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 ibm-im license_accepted="True"
-
-
-3.IBM IM charm also needs an host from where the packages can be downloaded (the user has to keep the Installation Manager packages on this host server),from the directory where the package is kept, user name and password to connect to the host server.
-
-We have to provide values for curl-url and curl-opt to download the product.
-
-curl-url with hostname,package_dir,package name,checksum value, curl-opts with username and password,to proceed with the installation.
- To provide these run the following command:
-
-          juju set ibm-im curl_url="<hostname><package_dir><package_name>?<sha512=value>"
-	      juju set ibm-im curl_opts="-u <username>:<password>"
-          
-For eg:
-	
-	       juju set ibm-im curl_url="http://1.2.3.4/debs/agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip?sha512=d58483957f56c20492f174b5a112b93a35cb7e45d5009c5c5fc4a3d34f91d2fcbefff770cad578287056ca1af01cacd700eb349937530e6f44780075f7dbaaab"
-           juju set ibm-im curl_opts="-u root:root123"
-           
-		
-		
- The command to find the sha512 value is 
-
-           sha512sum <IM Package Name>
-
-
-4.Setting the license-accepted to False will uninstall the product:
-	
-	       juju set ibm-im license_accepted="False"
-
-**Note** : If user wants to install any other packages other then the packages mentioned in usage section, user need to download IBM-IM zip file to local trusty folder and edit the layer.yaml i.e provide the default package name under ibm-im-package option.
-
-Next user need to deploy locally with the command
-
-    juju deploy --repository=/home/charm1/charms/ local:trusty/ibm-im
-
-Next he need to follow the below deploy section from step 2 
-### Upgrade of ibm-im
-Once deployed and if the user wants to upgrade the newer version, setting the ibm-im-fp-package will upgrade the product.
-
-	      juju set ibm-im ibm_im_fp_package="<fix pack-name>"
-
-For eg:   
-       
-          juju set ibm-im ibm_im_fp_package="agent.installer.linux.gtk.x86_64_1.8.4001.20160217_1716.zip"
-
-**Note** Before setting the ibm-im-fp-package value user must host the package and provide curl-url and curl-opt options for Downloading fix pack package.
- 
- For eg:
-
-          juju set ibm-im curl_url="http://1.2.3.4/debs/agent.installer.linux.gtk.x86_64_1.8.4001.20160217_1716.zip?sha512=0a2e72e40530c2fe39edf76c45ea068a296d1670f8e4e75111c8efeede8e845087b4d5b850f5a570ffb0d5422b5f4b24121812ca754739989a9b160261d40d15"
-          juju set ibm-im curl_opts="-u root:root123"
-
-	
-		
-### Installation Verification
-	
-Once deployed, you can use IBM IM to install any IBM products. To verify IM is installed or not 
-get into the container and check whether the below path is exist.
-
-	opt/IBM/InstallationManager
-
-To get into the container run the below commmand.
-
-	juju ssh <machine-id where IBM IM is installed>
-
-
-### Uninstallation of ibm-im
-
-Setting the license-accepted to False will uninstall the product. 
-
-	juju set ibm-im license_accepted=False
-
-
-### Configuration
-
-- **license_accepted** Before you can use or install IBM IM,
-    you must accept the terms of International License
-    Agreement for Non-Warranted Programs and additional license information.
-    Please read the license agreement carefully
-   [IBM IM License](http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/39AFC1C1D485C4E085257E7300548B05?OpenDocument). Set the value of license-accepted to True if you agree to IBM IM license.
-
-**The IBM IM software cannot be installed until the terms and
-conditions are accepted.  The charm will not function correctly until the configuration option is set to True.**
-
-- **curl_url** For downloading package we need to set curl_url with following options.
-
-  - *hostname* - The web server host name from which IBM IM installation packages can be downloaded.
-  - *package_dir* - The package directory path in the web server.
-  - *package name* - The IBM IM Package name.
-  - *checksum value* - Checksum value to check integrity of IBM IM package. The Charm
-    uses sha512sum to check the integrity. If empty, it does not carry out the
-    integrity check. Use `sha512sum <Package Location/Package Name>`
-    to find out Checksum value for downloaded package. 
-
-- **curl_opts** We need to set curl_opts with following options.
-  - *username* - User name of the webserver host.
-  - *password* - Password of the webserver host.
-
-- **ibm-im-fp-package** The IBM IM Fix pack Package name. These must be provided when user wants to upgrade the charm.
-
-
-
-
-### IBM IM Information
-
-### General Information
-
-Details about IBM IM available [Here](http://www.ibm.com/support/knowledgecenter/SSDV2W/im_family_welcome.html)
-
-### Download Information
-
-Information on procuring IBM IM product is available at the [Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142)
-
-### License Information
-
-License information for IBM IM can be viewed [Here](http://www-03.ibm.com/software/sla/sladb.nsf/searchlis/?searchview&searchorder=4&searchmax=0&query=%28Installation+Manager+1.8.3%29)
-
-### Known Limitations
-
-This charm makes use of Juju Status commands, and requires juju 1.24 or greater
-
-### Contact Information
-
-For issues with this charm, please contact [IBM Juju Support Team](mailto:[e-mail])
\ No newline at end of file
+## Charm for IBM Installation Manager(IM) 1.8
+
+### Overview
+
+IBM Installation Manager
+
+IBM® Installation Manager is a single installation program that uses remote or local software repositories to install, modify, or update certain IBM products.
+
+User guides and security guides to support this release are available for
+online viewing [User Guide](http://www.ibm.com/support/knowledgecenter/SSDV2W/im_family_welcome.html)
+
+
+### Download of Product Binaries 
+
+Download your licensed IBM IM 1.8 software for Ubuntu.
+
+You can download product binaries from
+[Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142)
+
+
+### Usage
+Download your licensed IBM Installation Manager software and host it in a way that can be downloaded using curl.
+
+Curl-url and Curl-opts are two main options we are using from ibm-base-layer to download the ibm product as IBM-IM is built on top of the ibm-base layer [More Info](http://interfaces.juju.solutions/layer/ibm-base/)
+
+To download and install the code contained in this charm you must agree to the IBM license. 
+
+You can view the full license for `IBM Installation Manager`by visiting the [license-info](http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/39AFC1C1D485C4E085257E7300548B05?OpenDocument).
+
+Search for "IBM Installation Manager" and choose the license that applies to the version you are using.
+
+##### For (x86_64) Ubuntu , The packages are:
+
+IBM Installation Manager 1.8 (agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip)
+
+##### For Power (ppcle) Ubuntu, The packages are:
+
+IBM Installation Manager 1.8(agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip)
+
+Creating Repositories
+--------------------
+For deploying IBM IM charm the user needs to download the correct packages as mentioned in the 'Usage' section above and host it in a way which can be downloaded using curl.
+
+For eg:
+
+The packages should be hosted such that it can be downloaded using curl. For e.g using python simple HTTP Server as follows,If the user downloads the IM package agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip in /home/Downloads then the below commands will start a simple HTTP Server and host the packages in the /home/Downloads folder
+       
+     cd /home/Downloads
+     python -m SimpleHTTPServer
+
+And the curl-url would be 
+     
+     http://localhost:8000/package/agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip?md5=<md5 of agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip>
+
+### Deploy
+
+1.Run the following commands to deploy this charm:
+
+	      juju deploy ibm-im
+	      
+2.Here the charm will wait until the user accepts the license. If you agree to the license, run the following command.
+	
+           juju set ibm-im license_accepted="True"
+
+
+3.IBM IM charm also needs an host from where the packages can be downloaded (the user has to keep the Installation Manager packages on this host server),from the directory where the package is kept, user name and password to connect to the host server(as mentioned in the creating repositories section).
+
+We have to provide values for curl-url and curl-opt to download the product.
+
+curl-url with host name,package_dir,package name,checksum value, curl-opts with user name and password,to proceed with the installation.
+ To provide these run the following command:
+
+          juju set ibm-im curl_url="<hostname>/<package_dir><package_name>?<sha512=value>"
+	      juju set ibm-im curl_opts="-u <username>:<password>"
+          
+For eg:
+	
+	       juju set ibm-im curl_url="http://1.2.3.4/debs/agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip?sha512=d58483957f56c20492f174b5a112b93a35cb7e45d5009c5c5fc4a3d34f91d2fcbefff770cad578287056ca1af01cacd700eb349937530e6f44780075f7dbaaab"
+           juju set ibm-im curl_opts="-u root:root123"
+           
+		
+		
+ The command to find the sha512 value is 
+
+           sha512sum <IM Package Name>
+
+For eg:	
+	   
+           sha512sum agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip
+
+
+4.Setting the license-accepted to False will uninstall the product:
+	
+	       juju set ibm-im license_accepted="False"
+
+**Note** : If user wants to install any other packages other then the packages mentioned in usage section, user needs to download IBM-IM charm folder from charm store to local machine and edit the layer.yaml i.e provide the default package name under ibm-im-package option.
+
+Next user needs to deploy locally with the command
+
+    juju deploy --repository=<path_to_charms_folder> local:trusty/ibm-im
+
+Next he need to follow the below deploy section from step 2 
+### Upgrade of ibm-im
+Once deployed and if the user wants to upgrade to the newer version, setting the ibm-im-fp-package will upgrade the product.
+
+	      juju set ibm-im ibm_im_fp_package="<fix pack-name>"
+
+For eg:   
+       
+          juju set ibm-im ibm_im_fp_package="agent.installer.linux.gtk.x86_64_1.8.4001.20160217_1716.zip"
+
+**Note** Before setting the ibm-im-fp-package value user must host the package and provide curl-url and curl-opt options for Downloading fix pack package.
+ 
+ For eg:
+
+          juju set ibm-im curl_url="http://1.2.3.4/debs/agent.installer.linux.gtk.x86_64_1.8.4001.20160217_1716.zip?sha512=0a2e72e40530c2fe39edf76c45ea068a296d1670f8e4e75111c8efeede8e845087b4d5b850f5a570ffb0d5422b5f4b24121812ca754739989a9b160261d40d15"
+          juju set ibm-im curl_opts="-u root:root123"
+
+	
+		
+### Installation Verification
+	
+Once deployed, you can use IBM IM to install any IBM products. To verify IM is installed or not 
+get into the container and check whether the below path is exist.
+
+	/opt/IBM/InstallationManager
+
+To get into the container run the below command.
+
+	juju ssh <machine-id where IBM IM is installed>
+
+
+### Uninstallation of ibm-im
+
+Setting the license-accepted to False will uninstall the product. 
+
+	juju set ibm-im license_accepted=False
+
+
+### Configuration
+
+- **license_accepted** Before you can use or install IBM IM,
+    you must accept the terms of International License
+    Agreement for Non-Warranted Programs and additional license information.
+    Please read the license agreement carefully
+   [IBM IM License](http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/39AFC1C1D485C4E085257E7300548B05?OpenDocument). Set the value of license-accepted to True if you agree to IBM IM license.
+
+**The IBM IM software cannot be installed until the terms and
+conditions are accepted.  The charm will not function correctly until the configuration option is set to True.**
+
+- **curl_url** For downloading package we need to set curl_url with following options.
+
+  - *hostname* - The web server host name from which IBM IM installation packages can be downloaded.
+  - *package_dir* - The package directory path in the web server.
+  - *package name* - The IBM IM Package name.
+  - *checksum value* - Checksum value to check integrity of IBM IM package. The Charm
+    uses sha512sum to check the integrity. If empty, it does not carry out the
+    integrity check. Use `sha512sum <Package Location/Package Name>`
+    to find out Checksum value for downloaded package. 
+
+- **curl_opts** We need to set curl_opts with following options.
+  - *username* - User name of the webserver host.
+  - *password* - Password of the webserver host.
+
+- **ibm-im-fp-package** The IBM IM Fix pack Package name. These must be provided when user wants to upgrade the charm.
+
+
+
+
+### IBM IM Information
+
+### General Information
+
+Details about IBM IM available [Here](http://www.ibm.com/support/knowledgecenter/SSDV2W/im_family_welcome.html)
+
+### Download Information
+
+Information on procuring IBM IM product is available at the [Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142)
+
+### License Information
+
+License information for IBM IM can be viewed [Here](http://www-03.ibm.com/software/sla/sladb.nsf/searchlis/?searchview&searchorder=4&searchmax=0&query=%28Installation+Manager+1.8.3%29)
+
+### Known Limitations
+
+This charm makes use of juju status commands, and requires juju 1.24 or greater
+
+### Contact Information
+
+For issues with this charm, please contact [IBM Juju Support Team](mailto:[e-mail])
+### Additional Information
+This layer is intended to be extended by other charms that would benefit from having IBM Installation Manager (IBM IM) preinstalled. For example, a WebSphere layered charm could include this layer so it could use IBM IM to install WebSphere.
+
+To use this layer, include the following in your `layer.yaml`:
+
+```yaml
+includes: ['layer:ibm-installation-manager']
+```
+
+Then, in your charm, watch for the `im.installed` state, at which point you will know the IBM IM tools are available:
+
+```bash
+IM_PATH=/opt/IBM/InstallationManager
+
+@when 'im.installed'
+install_was() {
+    WAS_REPO=`config-get was_repo`
+    ${IM_PATH}/tools/imutilsc saveCredential -url $WAS_REPO -userName $IBM_ID_NAME -userPassword $IBM_ID_PASS -secureStorageFile "secure.store"
+    ${IM_PATH}/installc -input silent-install.xml -acceptlicense -secureStorageFile "secure.store"
+    ${IM_PATH}/imcl install $IM_ARGS
+}

=== modified file 'copyright'
--- copyright	2016-04-22 11:21:50 +0000
+++ copyright	2016-04-27 12:12:01 +0000
@@ -1,4 +1,4 @@
-Copyright 2015 IBM Corporation
+Copyright 2016 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.

=== removed file 'files/sftp_get.sh'
--- files/sftp_get.sh	2016-04-22 11:21:50 +0000
+++ files/sftp_get.sh	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/usr/bin/expect
-# Helper script to connect and download using sftp
-# Invoked from download action
-# Usage: sftp_get.sh user password host remote_dir localpath
-
-set user [lindex $argv 0]
-set password [lindex $argv 1]
-set host [lindex $argv 2]
-set r_dir [lindex $argv 3]
-set localpath [lindex $argv 4]
-
-set timeout 90
-spawn sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $user@$host
-expect "password:"
-send "$password\n"
-expect "sftp>"
-set timeout 3000
-send "get -r $r_dir $localpath\n"
-expect "sftp>"
-send "exit\n"

=== modified file 'reactive/ibm-im.sh'
--- reactive/ibm-im.sh	2016-04-22 11:21:50 +0000
+++ reactive/ibm-im.sh	2016-04-27 12:12:01 +0000
@@ -3,109 +3,96 @@
 
 source charms.reactive.sh
 ARCHIVE_DIR=files/archives
-
-# Fail if we're not on a supported arch. Also set defaults for filename
-# and sha1sum based on arch.
 ARCHITECTURE=`uname -m`
-DEFAULT_INSTALLER_FILE_IM=""
-if [ "$ARCHITECTURE" = "x86_64" ]; then
-        DEFAULT_INSTALLER_FILE_IM="agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip"
-elif [ "$ARCHITECTURE" = "ppc64le" ]; then
-        DEFAULT_INSTALLER_FILE_IM="agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip"
-else
-        status-set blocked "IBM IM: Platform not supported"
-fi
-
-# Get the package name from layer.yaml to check whether the user wants to install a different package 
-	im_file_name="$(layer_option ibm-im ibm_im_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
-			cfg_im_pkg_name=${DEFAULT_INSTALLER_FILE_IM}
-	fi
-
-cfg_im_pkg_name=${DEFAULT_INSTALLER_FILE_IM}
 
 # Installation Manager install path
 IM_INSTALL_PATH="/opt/IBM/InstallationManager"
 
-# Check whether IM is installed
-is_im_installed()
-{
-	if [ -f $IM_INSTALL_PATH/eclipse/IBMIM ]; then
-		echo "True"
-	else
-		echo "False"
-	fi
-
-}
-
-#Remove IM, if installed
-remove_im_software()
-{
-	im_installed=`is_im_installed`
-	if [ $im_installed == True ]; then
-		juju-log "IBM IM: Removing IBM IM software."
-		/root/var/ibm/InstallationManager/uninstall/uninstallc
-		juju-log "IBM IM: Removed IBM IM software"
-	fi
-
-}
 
 @when 'ibm-base.license.accepted' 'ibm-base.curl.resource.fetched'
 @when_not 'ibm-im.installed'
 function install(){
-# Do the actual IBM IM install
-im_inst=`is_im_installed`
-	if [ $im_inst == False ]; then
-		if [ -f  $CHARM_DIR/$ARCHIVE_DIR/$cfg_im_pkg_name ]; then
-			juju-log "IBM IM: downloading and extracting IM packages"
-			if [ -f  $CHARM_DIR/$ARCHIVE_DIR/userinstc ]; then
-				juju-log "IBM IM: IBM IM package contents extracted already."
-			else
-				cd $CHARM_DIR/$ARCHIVE_DIR
-				
+# Get the package name to check whether the user wants to install a different package 
+      im_file_name="$(layer_option ibm-im ibm_im_package)"
+      cfg_im_pkg_name=$im_file_name
+      
+      #Check whether user has selected right package name from the package name string. If he selects wrong package name , install would fail.
+      # Set package name to a predefined value if user have not set the layer option
+      if [ "$cfg_im_pkg_name" == "" ]; then
+          if [ "$ARCHITECTURE" = "x86_64" ]; then
+                DEFAULT_INSTALLER_FILE_IM="agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip"
+          elif [ "$ARCHITECTURE" = "ppc64le" ]; then
+                DEFAULT_INSTALLER_FILE_IM="agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip"
+          else
+                status-set blocked "IBM IM: Platform not supported"
+          fi
+             cfg_im_pkg_name=${DEFAULT_INSTALLER_FILE_IM}
+      else
+          if [ "$ARCHITECTURE" = "x86_64" ]; then
+                juju-log "Checking the package name"
+                if echo "$cfg_im_pkg_name" | grep -q "x86"; then
+                        juju-log "IBM IM: Package name is matching for the platform"
+                else
+                        juju-log "IBM IM: Probably Not the right package. IM install will fail if its not the right package"
+                        status-set blocked "Probably Not the right package. Please configure the correct package name"
+                        exit 0
+                fi
+          else
+                if echo "$cfg_im_pkg_name" | grep -q "ppcle"; then
+                        juju-log "IBM IM: Package name is matching for the platform"
+                else
+                        juju-log "IBM IM: Probably Not the right package. IM install will fail if its not the right package"
+                        status-set blocked "Probably Not the right package. Please configure the correct package name"
+                        exit 0
+                fi
+          fi
+      fi
+ 
+      # Do the actual IBM IM install
+   if [ -f  $CHARM_DIR/$ARCHIVE_DIR/$cfg_im_pkg_name ]; then
+      juju-log "IBM IM: downloading and extracting IM packages"
+      if [ -f  $CHARM_DIR/$ARCHIVE_DIR/userinstc ]; then
+        juju-log "IBM IM: IBM IM package contents extracted already."
+      else
+        cd $CHARM_DIR/$ARCHIVE_DIR
+
                                 juju-log "im_pkg_name===="$cfg_im_pkg_name
                                 if ! unzip  $cfg_im_pkg_name -d $CHARM_DIR/$ARCHIVE_DIR
-				then
-					juju-log "IBM IM: Unable to extract the IM package content. Verify whether the package is corrupt."
-					# Remove corrupt archive file
-					status-set blocked "IBM Installation Manager package is corrupt"
-					rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$im_pkg_name
-					exit 0
-				else
-					juju-log "IBM IM: Installation Manager extracted successfully."
-				fi
-			fi
-		fi
-		juju-log "IBM IM: IM installation start"
-		# Check IM package availability
-		juju-log $CHARM_DIR/$ARCHIVE_DIR
-		if [ -f  $CHARM_DIR/$ARCHIVE_DIR/userinstc ];
-		then
+        then
+          juju-log "IBM IM: Unable to extract the IM package content. Verify whether the package is corrupt."
+          # Remove corrupt archive file
+          status-set blocked "IBM Installation Manager package is corrupt"
+          rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$im_pkg_name
+          exit 0
+        else
+          juju-log "IBM IM: Installation Manager extracted successfully."
+        fi
+      fi
+    fi
+    juju-log "IBM IM: IM installation start"
+    # Check IM package availability
+    juju-log $CHARM_DIR/$ARCHIVE_DIR
+    if [ -f  $CHARM_DIR/$ARCHIVE_DIR/userinstc ];
+    then
 
-			juju-log "IBM IM: IM Packages available for installation."
-			cp $CHARM_DIR/$ARCHIVE_DIR/install.xml $CHARM_DIR/$ARCHIVE_DIR/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/silent_install.xml
-			if $CHARM_DIR/$ARCHIVE_DIR/userinstc  -input  $CHARM_DIR/$ARCHIVE_DIR/silent_install.xml -acceptlicense
-			then
-			    set_state 'ibm-im.installed'
+      juju-log "IBM IM: IM Packages available for installation."
+      cp $CHARM_DIR/$ARCHIVE_DIR/install.xml $CHARM_DIR/$ARCHIVE_DIR/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/silent_install.xml
+      if $CHARM_DIR/$ARCHIVE_DIR/userinstc  -input  $CHARM_DIR/$ARCHIVE_DIR/silent_install.xml -acceptlicense
+      then
+          set_state 'ibm-im.installed'
                   
-				status-set active "IBM IM: IM Is installed successfully"
-			else
-				juju-log "IBM IM: Error while installing  IM"
-				exit 1
-			fi
+          status-set active "IBM IM: IM Is installed successfully"
+      else
+        juju-log "IBM IM: Error while installing  IM"
+        exit 1
+      fi
 
-		else
-			juju-log "IBM IM: IM Packages missing. Please check README file"
-			status-set maintenance "IBM IM install failed"
-			exit 1
-		fi
-	else
-		juju-log "IBM IM: IBM IM Installed already using same package name."
-	fi
+    else
+      juju-log "IBM IM: IM Packages missing. Please check README file"
+      status-set maintenance "IBM IM install failed"
+      exit 1
+   fi
   }
 
   
@@ -114,63 +101,66 @@
 function install-ibm-im-fixpack(){
 ibm_im_fp_package=`config-get ibm_im_fp_package`
 
-if [ -f  $CHARM_DIR/$ARCHIVE_DIR/$ibm_im_fp_package ]; then 
+   if [ -f  $CHARM_DIR/$ARCHIVE_DIR/$ibm_im_fp_package ]; then 
       juju-log "IBM-IM: ibm_im_fp_package is available"
                 if [ -f  $CHARM_DIR/$ARCHIVE_DIR/FP/userinstc ]; then
-		   juju-log "IBM IM: IBM IM package contents extracted already."
-		   else
-	            mkdir $CHARM_DIR/$ARCHIVE_DIR/FP
+         juju-log "IBM IM: IBM IM package contents extracted already."
+         else
+             mkdir $CHARM_DIR/$ARCHIVE_DIR/FP
                     cd $CHARM_DIR/$ARCHIVE_DIR
-				juju-log "im_fp_pkg_name===="$ibm_im_fp_package
+                    juju-log "im_fp_pkg_name===="$ibm_im_fp_package
                              if ! unzip  $ibm_im_fp_package -d $CHARM_DIR/$ARCHIVE_DIR/FP
-				then
-					juju-log "IBM IM: Unable to extract the IM FP package content. Verify whether the package is corrupt."
-					# Remove corrupt archive file
-					status-set blocked "IBM Installation Manager fixpack package is corrupt"
-					rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$ibm_im_fp_package
-					exit 0
-				else
-					juju-log "IBM IM: Installation Manager Fix pack extracted successfully."
-			     fi
- 		 fi
-	         juju-log "IBM IM: IM upgrading start"
-		# Check IM package availability
-		juju-log $CHARM_DIR/$ARCHIVE_DIR
-		if [ -f  $CHARM_DIR/$ARCHIVE_DIR/FP/userinstc ];
-		then
+         then
+          juju-log "IBM IM: Unable to extract the IM FP package content. Verify whether the package is corrupt."
+          # Remove corrupt archive file
+          status-set blocked "IBM Installation Manager fixpack package is corrupt"
+          rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$ibm_im_fp_package
+          exit 0
+         else
+             juju-log "IBM IM: Installation Manager Fix pack extracted successfully."
+         fi
+    fi
+        juju-log "IBM IM: IM upgrading start"
+    # Check IM package availability
+    juju-log $CHARM_DIR/$ARCHIVE_DIR
+    if [ -f  $CHARM_DIR/$ARCHIVE_DIR/FP/userinstc ];
+    then
 
-			juju-log "IBM IM: IM FP Packages available for installation."
-			cp $CHARM_DIR/$ARCHIVE_DIR/FP/install.xml $CHARM_DIR/$ARCHIVE_DIR/FP/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/FP/silent_install.xml
-			if $CHARM_DIR/$ARCHIVE_DIR/FP/userinstc  -input  $CHARM_DIR/$ARCHIVE_DIR/FP/silent_install.xml -acceptlicense
-			then
-			    set_state 'ibm-im.updated'
+      juju-log "IBM IM: IM FP Packages available for installation."
+      cp $CHARM_DIR/$ARCHIVE_DIR/FP/install.xml $CHARM_DIR/$ARCHIVE_DIR/FP/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/FP/silent_install.xml
+      if $CHARM_DIR/$ARCHIVE_DIR/FP/userinstc  -input  $CHARM_DIR/$ARCHIVE_DIR/FP/silent_install.xml -acceptlicense
+      then
+        set_state 'ibm-im.updated'
                   
-				status-set active "IBM IM: IM Is updated successfully"
-			else
-				juju-log "IBM IM: Error while updating  IM"
-				exit 1
-			fi
-		fi
+        status-set active "IBM IM: IM Is updated successfully"
+      else
+        juju-log "IBM IM: Error while updating  IM"
+        exit 1
+      fi
+   fi
 
    else
         juju-log "IBM_IM: Fix pack is not available to install, please provide the correct package"
-	    status-set maintenance "IBM IM updating failed"
-			exit 1
+      status-set maintenance "IBM IM updating failed"
+      exit 1
 fi
 
 }
 
 @when 'config.changed.ibm_im_fp_package'
 function config-changed-ibm-im-fp(){
+     rm -rf $CHARM_DIR/$ARCHIVE_DIR/FP
      remove_state 'ibm-im.updated'
-     rm -rf $CHARM_DIR/$ARCHIVE_DIR/FP
+     
 }
 
 @when 'ibm-im.installed'
 @when_not 'ibm-base.license.accepted'
 function uninstall() {
-    remove_im_software
+    juju-log "IBM IM: Removing IBM IM software."
+    /root/var/ibm/InstallationManager/uninstall/uninstallc
+    juju-log "IBM IM: Removed IBM IM software"
     remove_state "ibm-im.installed"
     status-set blocked "IBM IM uninstalled"
 }