Merge lp:~ibmcharmers/charms/trusty/ibmwxs/devel into lp:~saran110/charms/trusty/ibmwxs/ibmwxs-fix

[sharan]

[lp:~ibmcharmers/charms/trusty/ibmwxs/devel]

16. By <sharan><email address hidden> on 2015-11-11

Updated files

Unmerged revisions

16. By <sharan><email address hidden> on 2015-11-11

Updated files

15. By <sharan><email address hidden> on 2015-11-06

Updated files for IBMWXS

14. By sharan on 2015-09-30

Updated README.md

13. By sharan on 2015-09-01

Initial Check for IBMWXS

12. By sharan on 2015-09-01

Initial Check for IBMWXS

11. By sharan on 2015-09-01

Initial Check for IBMWXS

10. By <email address hidden> on 2015-08-31

Initial Check up for IBMWXS

9. By sharan on 2015-08-27

Initial Checkup for IBMWXS

8. By sharan on 2015-08-24

Initial Check up for IBMWXS

7. By sharan on 2015-08-24

Initial Check for IBMWXS

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2015-11-11 11:37:05 +0000
@@ -0,0 +1,131 @@
+Charm for IBM® WebSphere® eXtreme Scale V8.6.0.7
+
+# Overview
+IBM® WebSphere® eXtreme Scale is an elastic, scalable, in-memory data grid (IMDG). It is designed to help you handle exponential growth of transactions. With WebSphere eXtreme Scale, you can expect an enhanced quality of service in high-performance computing environments.
+
+For details on IBM Websphere Extreme Scale please visit [WXS Product page][wxs-installation-step]. 
+This charm installs IBM® WebSphere® eXtreme Scale V8.6.0.7 in standalone mode on amd64 architecture.
+
+# Usage
+Download your licensed IBM® WebSphere® eXtreme Scale software for Ubuntu and put up its contents on a web server like Apache and configure Apache to serve this package.This package can be then accessed using a URL from the web server.
+
+Download your licensed IBM Installation Manager software version 1.8 and above and upload to your apache repository 
+
+Download your licensed IBM Websphere eXtreme Scale Base software 8.6.0 and upload to your apache repository 
+
+Download your licensed IBM Websphere eXtreme Scale software fixpack version 8.6.0.7 version and upload to your apache repository 
+
+# Creating the repositories in Apache
+Run steps below with admin access
+
+Install needed packages
+	```apt-get install dpkg-dev apache2```
+Create a repository on Apache server under your Apache repository directory.
+Configure Apache server to allow access to the repository.
+
+To install IBM Websphere Extreme Scale 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 
+[IBM Installation Manager Steps][im-installation-step].
+
+To install IBM products you must agree to the license. License information can be found [WXS Software license agreement][wxs-license].
+
+To install Websphere Extreme Scale product you need to get the packages for ubuntu, please visit
+[WXS Installation Steps][wxs-installation-step].
+
+Deploy charms as below:  
+```juju deploy ibmwxs``` This will execute Websphere Extreme Scale software install prerequisite steps(it will install IBM Installation Manager) and install Websphere Extreme Scale product
+
+At this point the charm will wait until the user accepts the license. If you agree to the license for IBM Installation Manager and IBM Websphere Extreme Scale products, run the following commands:
+
+```juju set ibmwxs accept-ibm-im-license=True```
+
+```juju set ibmwxs accept-ibm-wxs-license=True```
+
+In case after installing the product if you set license to "False", Product will get uninstalled and to reinstall the product you need to accept the license first using ```juju set wxs accept-ibm-wxs-license=True``` command.
+
+If you need a relation between the WXS charm, add a unit on different container as 
+```juju add-unit ibmwxs``` but adding a unit on the same container can not be done.
+
+# Configuration
+
+See config.yaml file for more information.
+
+	`accept-ibm-wxs-license`
+Before you can use or install IBM Websphere Extreme Scale,
+you must accept the terms of International License
+Agreement for Non-Warranted Programs and additional license information.
+Please read the license agreement carefully.
+
+Set the value of accept-ibm-wxs-license to True if you agree to IBM Websphere Extreme Scale license.
+
+**The IBM Websphere Extreme Scale software cannot be installed until the terms and
+conditions are accepted.  The charm will not function correctly until
+this configuration option is set to True.**
+
+`url`:
+The web server URL from which IBM IM, IBM WXS base and fixpack install packages can be downloaded.
+
+`im_file_name`:
+The IBM Installation Manager Package name. If not set, it is assigned the value "agent.installer.linux.gtk.x86_64_1.8.2000.20150303_1526.zip" for x86_64 based machine.
+
+`wxs_base_file_name`:
+The WXS Base Package name. If not set, it is assigned the value "WS_XSCALE_V8.6_MP_ML.zip" for x86_64 based machine.
+
+`wxs_fixpack_file_name`:
+The WXS Base Package name. If not set, it is assigned the value "8.6.0-WS-WXS-FP0000007.zip" for x86_64 based machine.
+
+`sha_im`:
+Checksum value to check integrity of IBM IM package. The Charm uses sha1sum to check the integrity. For example, run the command:
+<sha1sum agent.installer.linux.gtk.x86_64_1.8.2000.20150303_1526.zip | cut -d " " -f1> to get the checksum value for IBM Installation Manager package. If empty, it does not carry out the integrity check. The user should not change this value unless the corresponding installer package changes.
+
+`sha_base`:
+Checksum value to check integrity of IBM WXS base package. The Charm uses sha1sum to check the integrity. For example, run the command: <sha1sum WS_XSCALE_V8.6_MP_ML.zip | cut -d " " -f1> to get the checksum value for IBM WXS base package. If empty, it does not carry out the integrity check. The user should not change this value unless the corresponding installer package changes.
+
+`sha_fixpack`:
+Checksum value to check integrity of IBM WXS fixpack package. The Charm uses sha1sum to check the integrity. For example, run the command: <sha1sum 8.6.0-WS-WXS-FP0000007.zip | cut -d " " -f1> to get the checksum value for IBM WXS fixpack package. If empty, it does not carry out the integrity check. The user should not change this value unless the corresponding installer package changes.
+
+After deploying IBMWXS, to test whether the product is working or not, run the runclient.sh command which is present in /opt/ibm/WXS/ObjectGrid/gettingstarted/. Now run the script as below
+
+for insertion of the record
+
+./runclient.sh i key value
+
+to get the record
+
+./runclient.sh g key
+
+when you run the above script, you will get the corresponding value from the grid.
+
+IBM WXS Information
+-------------------
+
+(1) General Information 
+
+Information on IBM WXS available at the [WXS Infocenter][product-page]
+
+(2) Download Information
+
+Information on procuring WXS product is available at the [Passport Advantage Site][passport-wxs]
+
+(3) Peer Relation Information
+
+Information on peer relation for catalogServer and containerServer at the [WXS Infocenter][wxs-relation]
+
+(4) Contact Information
+
+For issues with this charm, please contact IBM Juju Support Team <[e-mail]>
+
+
+<!-- Links -->
+
+[product-page]: http://www-01.ibm.com/support/knowledgecenter/SSTVLU_8.6.0/com.ibm.websphere.extremescale.doc/kc_welcome-xs.html
+
+[passport-wxs]: http://www-01.ibm.com/software/passportadvantage/
+
+[wxs-relation]: http://www-01.ibm.com/support/knowledgecenter/SSTVLU_8.6.0/com.ibm.websphere.extremescale.doc/cxscatservbp.html?lang=en
+
+[wxs-installation-step]: http://www.ibm.com/software/products/en/websphere-extreme-scale
+
+[im-installation-step]:http://www-01.ibm.com/support/docview.wss?uid=swg27025142
+
+[wxs-license]: http://www-03.ibm.com/software/sla/sladb.nsf/lilookup/53D234CCEB5C2EC585257E3C0062B9F6?OpenDocument

=== renamed file 'README.md' => 'README.md.moved'
=== added file 'config.yaml'
--- config.yaml	1970-01-01 00:00:00 +0000
+++ config.yaml	2015-11-11 11:37:05 +0000
@@ -0,0 +1,74 @@
+options:
+  url:
+    type: string
+    default: ""
+    description: |
+        URL to download IBM Websphere Extreme Scale packages. If not set or set
+        incorrectly, the charm cannot install the IBM WXS software.
+  wxs_base_file_name:
+    type: string
+    default: ""
+    description: |
+        Name of the WXS base 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 WXS software.
+  wxs_fixpack_file_name:
+    type: string
+    default: ""
+    description: |
+        Name of the WXS fix pack 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 WXS software.
+  im_file_name:
+    type: string
+    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-wxs-license:
+    type: boolean
+    default: False  
+    description: |
+        The IBM Websphere Extreme Scale (WXS) software can only be used by
+        accepting the terms and conditions for IBM Websphere Extreme Scale License.
+        Setting this option to True
+        indicates that you have read and accepted the IBM WXS terms and
+        conditions found in the license file. The details about accessing
+        the license(s) can be found in the README.
+        Do not set this to False if a relation exists
+  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.
+  sha_im:
+    type: string
+    default: "f35653e20c7925d43007a1cff83623c979109ac5"
+    description: |
+        Checksum value to check integrity of IBM IM pacakage. The Charm uses
+        sha1sum to check the integrity. For example, run the command: 
+        <sha1sum agent.installer.linux.gtk.x86_64_1.8.2000.20150303_1526.zip | cut -d " " -f1> 
+        to get the checksum value for IBM Installation Manager pacakage.
+        If empty, it does not carry out the integrity check. 
+  sha_base:
+    type: string
+    default: "801bb88913e90413a271b6102d67276a9129dcf3"
+    description: |
+        Checksum value to check integrity of IBM WXS base pacakage. The Charm uses
+        sha1sum to check the integrity. For example, run the command: 
+        <sha1sum WS_XSCALE_V8.6_MP_ML.zip | cut -d " " -f1> to get the checksum value 
+        for IBM WXS base pacakage. If empty, it does not carry out the integrity check.
+  sha_fixpack:
+    type: string
+    default: "6e99ec379ed99521a184fbe0086c9d16055a67db"
+    description: |
+        Checksum value to check integrity of IBM WXS fixpack pacakage. The Charm uses
+        sha1sum to check the integrity. For example, run the command: 
+        <sha1sum 8.6.0-WS-WXS-FP0000007.zip | cut -d " " -f1> to get the checksum value 
+        for IBM WXS fixpack pacakage. If empty, it does not carry out the integrity check.

=== renamed file 'config.yaml' => 'config.yaml.moved'
=== added file 'copyright'
--- copyright	1970-01-01 00:00:00 +0000
+++ copyright	2015-11-11 11:37:05 +0000
@@ -0,0 +1,14 @@
+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.
+

=== renamed file 'copyright' => 'copyright.moved'
=== added directory 'files'
=== renamed directory 'files' => 'files.moved'
=== added directory 'files/archives'
=== added directory 'files/archives/IM'
=== added directory 'hooks'
=== renamed directory 'hooks' => 'hooks.moved'
=== added file 'hooks/config-changed'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2015-11-11 11:37:05 +0000
@@ -0,0 +1,441 @@
+#!/bin/bash
+# config-changed occurs everytime a new configuration value is updated (juju set)
+
+set -e
+IM_INSTALL_PATH=/opt/IBM/InstallationManager
+WXS_INSTALL_PATH=/opt/ibm/WXS
+ARCHIVE_DIR=$CHARM_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
+}
+
+#Remove IM, if installed
+remove_im_software()
+{
+	im_installed=`is_im_installed`
+	if  [ $im_installed == True ]; then
+		#Uninstalling IM
+		/root/var/ibm/InstallationManager/uninstall/uninstallc
+	fi
+}
+
+stop_wxs_servers()
+{
+if [ -d $WXS_INSTALL_PATH/ObjectGrid/gettingstarted/ ]; then
+	set +e
+	ps -ef | grep "[c]ontainer"
+	ipaddress=`unit-get private-address`
+	if [ $? == 0 ]; then
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/stopcontainer.sh c1
+		if [ $? == 0 ]; then
+			juju-log "containerServer stopped successfully"
+		else
+			juju-log "Error while stopping containerServer"
+			exit 1
+		fi
+	else
+		juju-log "containerServer is not running"
+	fi
+
+	ps -ef | grep "[c]atalog"
+	if [ $? == 0 ]; then
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/stopcat.sh
+		if [ $? == 0 ]; then
+			juju-log "catalogServer stopped successfully"
+		else
+			juju-log "Error while stopping catalogServer"
+			exit 1
+		fi
+	else
+		juju-log "catalogServer is not running"
+	fi
+	set -e
+fi
+}
+
+is_wxs_installed()
+{
+	if [ -d $WXS_INSTALL_PATH ]; then
+		echo "True"
+	else
+		echo "False"
+	fi
+}
+
+#remove IBM IM if license not accepted
+
+remove_unaccepted_im_software()
+{
+	if  [ $1 == False ]; then
+		wxs_installed=`is_wxs_installed`
+		if  [ "$wxs_installed" == "True" ]; then
+			juju-log "Can not uninstall IM as it has WXS product installed"
+			exit 0
+		fi
+		juju-log "Removing IBM IM (if installed) as the license agreement is not accepted."
+		remove_im_software
+	fi
+}
+
+# Remove Websphere Extreme Scale, if installed
+remove_wxs_software()
+{
+	im_installed=`is_im_installed`
+	# Check IM package availability
+	if  [ $im_installed == False ]; then
+		juju-log "IM is not present. Cannot proceed with WXS uninstall."
+		exit 0
+	fi
+	wxs_installed=`is_wxs_installed`
+	if  [ "$wxs_installed" == "True" ]; then
+		juju-log "Stop WXS servers"
+		stop_wxs_servers
+		juju-log "Uninstall Websphere Extreme Scale"
+		$IM_INSTALL_PATH/eclipse/tools/imcl uninstall com.ibm.websphere.WXS.v86 -acceptLicense -installationDirectory $WXS_INSTALL_PATH
+		if [ "$?" != "0" ]; then
+			juju-log "Websphere Extreme Scale could not be uninstalled"
+			exit 1
+		fi
+		rm -rf $WXS_INSTALL_PATH
+	fi
+	juju-log "Removing Websphere Extreme Scale software completed"
+}
+# Remove Websphere Extreme Scale if license not accpeted
+remove_unaccepted_software()
+{
+	if  [ $1 == False ]; then
+		juju-log "Remove IBM Websphere Extreme Scale (if installed) as the license agreement is not accepted."
+		wxs_installed=`is_wxs_installed`
+		if  [ "$wxs_installed" == "True" ]; then
+			remove_wxs_software
+		fi
+	fi
+}
+
+wxs_base_installable=`config-get wxs_base_file_name`
+wxs_fixpack_installable=`config-get wxs_fixpack_file_name`
+im_installable=`config-get im_file_name`
+URL=`config-get url`
+im_license_accepted=`config-get accept-ibm-im-license`
+wxs_license_accepted=`config-get accept-ibm-wxs-license`
+ARCHITECTURE=`uname -m`
+cfg_base_pkg_name=""
+cfg_fixpack_pkg_name=""
+
+#Download IM Package
+download_IM()
+{
+	juju-log "Checking for the IM and archive dir is $ARCHIVE_DIR and if[ -f $ARCHIVE_DIR/IM/*.zip]"
+	#Exit if URL to download package is null
+	if [ "$URL" == "" ]; then
+		juju-log "IBM WXS: URL to download IBM IM package is not configured."
+		exit 0
+	fi
+
+	# If an install was done, get the name of the package from which it was done
+	if [ -f  $ARCHIVE_DIR/IM/*.zip ]; then
+		impkg_name=`ls $ARCHIVE_DIR/IM/*.zip`
+
+		if [ $? == 0 ]; then
+			impkg_name=`basename $impkg_name`
+		fi
+	fi
+
+	# Get the package name to check whether the user wants to install a different package
+	cfg_im_pkg_name=`config-get 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="agent.installer.linux.gtk.x86_64_1.8.2000.20150303_1526.zip"
+		else
+			juju-log "IBM WXS: Platform not supported."
+			exit 1
+		fi
+	fi
+
+	# The user has configured a different package name
+	if  [ "$impkg_name" != "$cfg_im_pkg_name" ]; then
+
+		#Download the new IM package
+		set +e
+		juju-log "IBM WXS: Downloading IM package."
+		wget -t 2  -P $ARCHIVE_DIR/IM $URL/$cfg_im_pkg_name
+
+		if [ $? == 0 ]; then
+			juju-log "IBM WXS: Downloaded IM package."
+			# Delete previously  downloaded and installed IM software
+			if [ "$impkg_name" != "" ]; then
+				juju-log "IBM WXS: Deleting the older IM package."
+				rm -rf $ARCHIVE_DIR/IM/$impkg_name
+				remove_unaccepted_im_software "False"
+			fi
+
+		else
+			juju-log "IBM WXS: Download of IM package failed."
+			juju-log "IBM WXS: 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 WXS: Please provide valid sha_im value for your package."
+		exit 0
+	elif [ "$SHA_IM" != "`sha1sum $ARCHIVE_DIR/IM/$cfg_im_pkg_name | cut -d" " -f1`" ]; then
+		juju-log "IBM WXS: IBM IM package is corrupt."
+		exit 0
+	fi
+}
+
+# Downlaod WXS package
+download_WXS()
+{
+	#Exit if URL to download package is null
+	if [ "$URL" == "" ]; then
+		juju-log "IBM WXS: URL to download IBM WXS package is not configured."
+		exit 0
+	fi
+
+	# If an install was done, get the name of the base package from which it was done
+	if [ -f  $ARCHIVE_DIR/*V8.6*.zip ]; then
+		base_pkg_name=`ls  $ARCHIVE_DIR/*V8.6*.zip`
+		if [ $? == 0 ]; then
+			base_pkg_name=`basename $base_pkg_name`
+		fi
+	fi
+
+	# If an install was done, get the name of the fixpack package from which it was done
+	if [ -f  $ARCHIVE_DIR/*FP*.zip ]; then
+		fixpack_pkg_name=`ls  $ARCHIVE_DIR/*FP*.zip`
+		if [ $? == 0 ]; then
+			fixpack_pkg_name=`basename $fixpack_pkg_name`
+		fi
+	fi
+
+	# Get the package name to check whether the user wants to install a different package
+	cfg_base_pkg_name=`config-get wxs_base_file_name`
+	cfg_fixpack_pkg_name=`config-get wxs_fixpack_file_name`
+	
+	# Set base package name to a predefined value if the user has not provided a package name
+	if [ "$cfg_base_pkg_name" == "" ]; then
+		if [ "$ARCHITECTURE" == "x86_64" ]; then
+			cfg_base_pkg_name="WS_XSCALE_V8.6_MP_ML.zip"
+		else
+			juju-log "IBM WXS: Platform not supported."
+			exit 1
+		fi
+	fi
+		
+	# Set fixpack package name to a predefined value if the user has not provided a package name
+	if [ "$cfg_fixpack_pkg_name" == "" ]; then
+		if [ "$ARCHITECTURE" == "x86_64" ]; then
+			cfg_fixpack_pkg_name="8.6.0-WS-WXS-FP0000007.zip"
+		else
+			juju-log "IBM WXS: Platform not supported."
+			exit 1
+		fi
+	fi
+
+	# The user has configured a different package name
+	if  [ "$base_pkg_name" != "$cfg_base_pkg_name" ]; then
+
+		#Download the new WXS package
+		set +e
+		juju-log "IBM WXS: Download WXS Base package."
+
+		wget -t 2  -P $ARCHIVE_DIR/ $URL/$cfg_base_pkg_name
+
+		if [ $? == 0 ]; then
+			# Delete previously  downloaded and installed WXS software
+			if [ "$base_pkg_name" != "" ]; then
+				juju-log "IBM WXS: Deleting the older WXS package."
+				rm $ARCHIVE_DIR/$base_pkg_name
+				rm -rf $WXS_INSTALL_PATH
+			fi
+		else
+			juju-log "IBM WXS: Download of WXS base package failed."
+			exit 0
+		fi
+		set -e
+	fi
+		
+	# The user has configured a different package name
+	if  [ "$fixpack_pkg_name" != "$cfg_fixpack_pkg_name" ]; then
+
+		#Download the new WXS package
+		set +e
+		juju-log "IBM WXS: Download WXS Fix Pack package."
+
+		wget -t 2  -P $ARCHIVE_DIR/ $URL/$cfg_fixpack_pkg_name
+
+		if [ $? == 0 ]; then
+			# Delete previously  downloaded and installed WXS software
+			if [ "$fixpack_pkg_name" != "" ]; then
+				juju-log "IBM WXS: Deleting the older WXS package."
+				rm $ARCHIVE_DIR/$fixpack_pkg_name
+				rm -rf $WXS_INSTALL_PATH
+			fi
+		else
+			juju-log "IBM WXS: Download of WXS fixpack package failed."
+			exit 0
+		fi
+		set -e
+	fi
+
+	# Check integrity of downloaded packages
+	SHA_BASE=`config-get sha_base`
+	if [ "$SHA_BASE" == "" ]; then
+		juju-log "IBM WXS: Please provide valid sha_base value for your package."
+		exit 0
+	elif [ "$SHA_BASE" != "`sha1sum $ARCHIVE_DIR/$cfg_base_pkg_name | cut -d" " -f1`" ]; then
+		juju-log "IBM WXS: IBM WXS Base package is corrupt."
+		exit 0
+	fi
+	SHA_FIXPACK=`config-get sha_fixpack`
+	if [ "$SHA_FIXPACK" == "" ]; then
+		juju-log "IBM WXS: Please provide valid sha_fixpack value for your package."
+		exit 0
+	elif [ "$SHA_FIXPACK" != "`sha1sum $ARCHIVE_DIR/$cfg_fixpack_pkg_name | cut -d" " -f1`" ]; then
+		juju-log "IBM WXS: IBM WXS Fix Pack package is corrupt."
+		exit 0
+	fi
+}
+
+juju-log "IBM IM for WXS install: Begin config-changed"
+# Remove IM if license not accepted abase exit. Else install it
+remove_unaccepted_im_software $im_license_accepted
+
+if [ $im_license_accepted == False ]; then
+	juju-log "IBM IM License not accepted."
+elif [ $im_license_accepted == True ]; then
+	juju-log "IBM IM License accepted"
+	im_inst=`is_im_installed`
+	if [ $im_inst == False ]; then
+		juju-log "Download and extract IM packages"
+		download_IM
+		#extract IM package if download succeeded
+		if [ -f  $ARCHIVE_DIR/IM/*.zip ]; then
+			if [ -f $ARCHIVE_DIR/IM/userinstc ]; then
+				juju-log "IBM WXS: IM binary package is already extracted"
+			else
+				juju-log "IBM WXS: Extracting IM binary package"
+				unzip $ARCHIVE_DIR/IM/*.zip -d $ARCHIVE_DIR/IM
+				if [ $? != 0 ]; then
+					juju-log "IBM WXS: Unable to extract the IM package content. Verify whether the package is corrupt."
+					#Remove corrupt archive file
+					rm -rf $ARCHIVE_DIR/IM/*.zip
+					exit 0
+				fi
+			fi
+		fi
+		juju-log "IM installation started"
+		# Check IM package availability
+		if [ -f $ARCHIVE_DIR/IM/userinstc ]; then
+			juju-log "IM Packages available for installation.";
+			cp  $ARCHIVE_DIR/IM/install.xml $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>" $ARCHIVE_DIR/IM/silent_install.xml
+			$ARCHIVE_DIR/IM/userinstc  -input  $ARCHIVE_DIR/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
+else
+	juju-log " Acceptable values for license are 'True' or 'False'"
+fi
+
+# Remove Websphere Extreme Scale if license not accepted and exit. Else install it
+remove_unaccepted_software $wxs_license_accepted
+if [ $wxs_license_accepted == False ]; then
+	juju-log "IBM WXS: IBM WXS License not accepted."
+elif [ $wxs_license_accepted == True ]; then
+	juju-log "IBM WXS: IBM WXS License accepted."	
+
+	wxs_inst=`is_wxs_installed`
+	im_installed=`is_im_installed`
+	if  [ $wxs_inst == False ]; then
+		# Check IM package availability
+		if  [ $im_installed == False ]; then
+			juju-log "IM is not present. You should make sure that you accepted License for both IM and WXS"
+			exit 0
+		fi
+		download_WXS
+
+		#extract WXS packages if download succeeded
+		if [ -f  $ARCHIVE_DIR/$cfg_base_pkg_name ]; then
+			if [ -d  $ARCHIVE_DIR/WXS_8600 ]; then
+				juju-log "WXS base binary package is already extracted"
+			else
+				juju-log "IBM WXS: Extracting WXS base binary package"
+				unzip $ARCHIVE_DIR/$cfg_base_pkg_name -d $ARCHIVE_DIR
+				if [ $? != 0 ]; then
+					juju-log "IBM WXS: Unable to extract the WXS package content. Verify whether the package is corrupt."
+					#Remove corrupt archive file
+					rm -rf $ARCHIVE_DIR/$cfg_base_pkg_name
+					exit 0
+				fi
+			fi
+		fi
+
+		if [ -f  $ARCHIVE_DIR/$cfg_fixpack_pkg_name ]; then
+			if [ -d  $ARCHIVE_DIR/8607 ]; then
+				juju-log "WXS fixpack binary package is already extracted"
+			else
+				juju-log "IBM WXS: Extracting WXS fixpack binary package"
+				unzip $ARCHIVE_DIR/$cfg_fixpack_pkg_name -d $ARCHIVE_DIR
+				if [ $? != 0 ]; then
+					juju-log "IBM WXS: Unable to extract the WXS fixpack package content. Verify whether the package is corrupt."
+					#Remove corrupt archive file
+					rm -rf $ARCHIVE_DIR/$cfg_fixpack_pkg_name
+					exit 0
+				fi
+			fi
+		fi
+
+		juju-log "WXS Base Installation started"
+		$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.WXS.v86 -acceptLicense -installationDirectory $WXS_INSTALL_PATH -repositories $ARCHIVE_DIR/WXS_8600
+		if [ $? == 0 ]; then
+			juju-log "WXS Base is installed successfully"
+		else
+			juju-log "Error while installing WXS Base"
+			exit 1
+		fi
+
+		juju-log "WXS Fix Pack Installation started"
+		$IM_INSTALL_PATH/eclipse/tools/imcl install com.ibm.websphere.WXS.v86 -acceptLicense -installationDirectory $WXS_INSTALL_PATH -repositories $ARCHIVE_DIR
+		if [ $? == 0 ]; then
+			juju-log "WXS Fix Pack is installed successfully"
+		else
+			juju-log "Error while installing WXS Fix Pack"
+			exit 1
+		fi
+	fi
+
+	set +e
+	serverstareted=`ps -ef | grep "[c]atalog"`
+	if [ -z "$serverstareted" ]; then
+		$CHARM_DIR/hooks/start
+        else
+		juju-log "Server already started "
+	fi
+	set -e
+fi
+
+juju-log "Websphere WXS: End config-changed"

=== added file 'hooks/install'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2015-11-11 11:37:05 +0000
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+juju-log "IBM WXS: Begin Install."
+
+# Install wget
+juju-log "IBM WXS: Download and install wget package"
+apt-get install -y wget
+juju-log "IBM WXS: wget downloaded and installed."
+
+private_address=`unit-get private-address`
+echo "$private_address `hostname`" >> /etc/hosts
+juju-log "IBM WXS: Download and install unzip package"
+apt-get install unzip
+juju-log "IBM WXS: unzip downloaded and installed."
+
+ARCHITECTURE=`uname -m`
+if [ "$ARCHITECTURE" != "x86_64" ]; then
+	juju-log "IBM WXS: Unsupported platform. IBM WXS installed with this Charm supports only the x86_64 platform."
+	exit 1
+fi
+
+juju-log "IBM WXS: End Install."

=== added file 'hooks/quorum-relation-changed'
--- hooks/quorum-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/quorum-relation-changed	2015-11-11 11:37:05 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+WXS_INSTALL_PATH=/opt/ibm/WXS
+juju-log "quorum-relation-changed started"
+catalogEndPoints=`relation-get catEndPoints`
+
+if [ $catalogEndPoints == "" ]; then
+	exit 0
+fi
+
+private_address=`unit-get private-address`
+set +e
+serverstareted=`ps -ef | grep "[c]atalog"`
+if [ -z "$serverstareted" ]; then
+	juju-log "$private_address catalogServer is not started now starting"
+        $WXS_INSTALL_PATH/ObjectGrid/bin/startXsServer.sh "$private_address-cs" -catalogServiceEndPoints $catalogEndPoints -quorum true -jvmArgs -Xmx256m
+else
+        juju-log "$private_address catalogServer is already started"
+fi
+set -e
+juju-log "quorum-relation-changed stopped"

=== added file 'hooks/quorum-relation-joined'
--- hooks/quorum-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/quorum-relation-joined	2015-11-11 11:37:05 +0000
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+WXS_INSTALL_PATH=/opt/ibm/WXS
+juju-log "quorum-relation-joined started"
+private_address=`unit-get private-address`
+catalogEndPoints=""
+relation_id=$(relation-ids quorum)
+clientPort="6601"
+listenerPort="2809"
+peerPort="6602"
+catEndPoints=""
+
+for relation_lis in $(relation-list); do
+	ip_address=`relation-get -r $relation_id private-address $relation_lis`
+	catalogEndPoints="$catalogEndPoints$ip_address-cs:$ip_address:$clientPort:$peerPort,"
+done
+
+catalogEndPoints="$catalogEndPoints$private_address-cs:$private_address:$clientPort:$peerPort"
+set +e
+serverstareted=`ps -ef | grep "[c]atalog"`
+
+if [ -z "$serverstareted"  ]; then
+	juju-log "catalogServer not yet all started"
+else
+	$WXS_INSTALL_PATH/ObjectGrid/bin/xscmd.sh -c teardown -sl "$private_address-cs"
+	while [ "`sudo fuser -n tcp 2809`" != "" ]; do
+		sudo fuser -n tcp -k 2809
+	done		
+fi
+
+relation-set catEndPoints=$catalogEndPoints
+set -e
+juju-log "quorum-relation-joined ended"

=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2015-11-11 11:37:05 +0000
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+WXS_INSTALL_PATH=/opt/ibm/WXS
+
+                    
+if [ -d $WXS_INSTALL_PATH/ObjectGrid/gettingstarted/ ]; then
+	juju-log "Start catalog server"
+	set +e
+        serverstareted=`ps -ef | grep "[c]atalog"`
+	if [ -z "$serverstareted" ]; then
+	
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/startcat.sh
+		if [ $? == 0 ]; then
+			juju-log "catalogServer started successfully"
+		else
+			juju-log "Error while starting catalogServer"
+			exit 1
+		fi
+
+		juju-log "Start container server"
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/startcontainer.sh c1
+		if [ $? == 0 ]; then
+			juju-log "containerServer started successfully"
+		else
+			juju-log "Error while starting containerServer"
+			exit 1
+		fi
+	
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/runclient.sh i key1 value1
+		if [ $? == 0 ]; then
+			juju-log "Inserted TestValue [value=value1] with key TestKey [key=key1] successfully"
+		else
+			juju-log "Error while inserting TestValue [value=value1] with key TestKey [key=key1]"
+			exit 1
+		fi
+
+		$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/runclient.sh g key1
+		if [ $? == 0 ]; then
+			juju-log "Value is TestValue [value=value1]"
+		else
+			juju-log "Error while retrieving TestValue"
+			exit 1
+		fi
+	else
+		juju-log "Servers alrealdy started no need to start in start hook"
+	fi
+	set -e
+fi
+juju-log "IBM WXS: End Start hook."

=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2015-11-11 11:37:05 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+WXS_INSTALL_PATH=/opt/ibm/WXS
+juju-log "IBM WXS: Begin Stop hook."
+
+if [ -d $WXS_INSTALL_PATH/ObjectGrid/gettingstarted/ ]; then
+
+	$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/stopcontainer.sh c1
+	if [ $? == 0 ]; then
+		juju-log "containerServer stopped successfully"
+	else
+		juju-log "Error while stopping containerServer"
+		exit 1
+	fi
+	
+	$WXS_INSTALL_PATH/ObjectGrid/gettingstarted/stopcat.sh
+	if [ $? == 0 ]; then
+		juju-log "catalogServer stopped successfully"
+	else
+		juju-log "Error while stopping catalogServer"
+		exit 1
+	fi
+fi
+
+juju-log "IBM WXS: End Stop hook."

=== added file 'icon.svg'
--- icon.svg	1970-01-01 00:00:00 +0000
+++ icon.svg	2015-11-11 11:37:05 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW X6 -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1in" height="0.999996in" version="1.1" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"
+viewBox="0 0 1000 1000"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+    <linearGradient id="id0" gradientUnits="userSpaceOnUse" x1="500.002" y1="999.996" x2="500.002" y2="0">
+     <stop offset="0" stop-color="#0465B2"/>
+     <stop offset="1" stop-color="#7ED3F7"/>
+    </linearGradient>
+    <mask id="id1">
+      <linearGradient id="id2" gradientUnits="userSpaceOnUse" x1="500.002" y1="58.4805" x2="500.002" y2="307.017">
+       <stop offset="0" stop-opacity="1" stop-color="white"/>
+       <stop offset="0.141176" stop-opacity="48.6863" stop-color="white"/>
+       <stop offset="1" stop-opacity="0" stop-color="white"/>
+      </linearGradient>
+     <rect fill="url(#id2)" width="1000" height="365"/>
+    </mask>
+    <radialGradient id="id3" gradientUnits="userSpaceOnUse" cx="613.782" cy="372.832" r="261.194" fx="613.782" fy="372.832">
+     <stop offset="0" stop-color="#7ED3F7"/>
+     <stop offset="1" stop-color="#0465B2"/>
+    </radialGradient>
+    <radialGradient id="id4" gradientUnits="userSpaceOnUse" cx="613.782" cy="372.832" r="261.194" fx="613.782" fy="372.832">
+     <stop offset="0" stop-color="#0465B2"/>
+     <stop offset="1" stop-color="#07425A"/>
+    </radialGradient>
+ </defs>
+ <g id="Layer_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <g id="_927323728">
+   <path id="Background" fill="url(#id0)" d="M0 676l0 -352c0,-283 41,-324 324,-324l352 0c284,0 324,41 324,324l0 352c0,283 -40,324 -324,324l-352 0c-283,0 -324,-41 -324,-324z"/>
+   <path fill="#999999" mask="url(#id1)" d="M0 365l0 -41c0,-283 41,-324 324,-324l352 0c284,0 324,41 324,324l0 41c0,-283 -40,-324 -324,-324l-352 0c-283,0 -324,41 -324,324z"/>
+   <path fill="#7ED3F7" fill-rule="nonzero" d="M500 126c103,0 197,42 264,110 68,67 110,161 110,264 0,103 -42,197 -110,264 -67,68 -161,110 -264,110 -103,0 -197,-42 -264,-110 -68,-67 -110,-161 -110,-264 0,-103 42,-197 110,-264 67,-68 161,-110 264,-110zm237 137c-61,-60 -145,-98 -237,-98 -92,0 -176,38 -237,98 -60,61 -98,145 -98,237 0,92 38,176 98,237 61,60 145,98 237,98 92,0 176,-38 237,-98 60,-61 98,-145 98,-237 0,-92 -38,-176 -98,-237z"/>
+   <circle fill="url(#id3)" cx="500" cy="500" r="335"/>
+   <circle fill="url(#id4)" cx="500" cy="500" r="335"/>
+   <polygon fill="#C9EFFF" fill-rule="nonzero" points="616,687 559,687 500,479 442,687 386,687 311,422 279,422 279,372 407,372 407,422 373,422 418,588 474,372 525,372 586,586 628,422 593,422 593,372 721,372 721,422 686,422 "/>
+  </g>
+ </g>
+</svg>

=== renamed file 'icon.svg' => 'icon.svg.moved'
=== added file 'metadata.yaml'
--- metadata.yaml	1970-01-01 00:00:00 +0000
+++ metadata.yaml	2015-11-11 11:37:05 +0000
@@ -0,0 +1,11 @@
+name: ibmwxs
+summary: IBM WebSphere Extreme Scale
+maintainer: IBM Juju Support Team <[e-mail]>
+description: IBM® WebSphere® eXtreme Scale is an elastic, scalable, in-memory data grid (IMDG). It is designed to help you handle exponential growth of transactions. With WebSphere eXtreme Scale, you can expect an enhanced quality of service in high-performance computing environments.
+tags:
+  - misc 
+  - IBM 
+subordinate: false
+peers:
+  quorum:
+    interface: wxs-quorum

=== renamed file 'metadata.yaml' => 'metadata.yaml.moved'
=== added directory 'tests'
=== renamed directory 'tests' => 'tests.moved'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2015-11-11 11:37:05 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# ATTENTION: wxs_url must contain the repository with
+#            your WXS packages
+
+WXS_URL=${WXS_URL?Error: IBM WXS repository must be defined in tests/00-setup}
+WXS_BASE_PKG=${WXS_BASE_PKG?Error: IBM WXS base package be defined in tests/00-setup}
+WXS_FIX_PKG=${WXS_FIX_PKG?Error: IBM WXS fix package be defined in tests/00-setup}
+IM_NAME=${IM_NAME?Error: IBM IM file name to be defined in tests/00-setup}
+SHA_BASE_PKG=${SHA_BASE_PKG?Error: IBM WXS sha base package be defined in tests/00-setup}
+SHA_FIX_PKG=${SHA_FIX_PKG?Error: IBM WXS sha fixpack package be defined in tests/00-setup}
+SHA_IM_PKG=${SHA_IM_PKG?Error: IBM WXS sha IM  package be defined in tests/00-setup}
+
+# Add a local configuration file
+cat << EOF > local.yaml
+wxs:
+ wxs_url: "$WXS_URL"
+ wxs_base_package: "$WXS_BASE_PKG"
+ wxs_fix_pkg: "$WXS_FIX_PKG"
+ im_name: "$IM_NAME"
+ sha_base_pkg: "$SHA_BASE_PKG"
+ sha_fix_pkg: "$SHA_FIX_PKG"
+ sha_im_pkg: "$SHA_IM_PKG"
+EOF
+
+add-apt-repository ppa:juju/stable -y
+apt-get update
+apt-get install amulet -y

=== added file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
+++ tests/10-bundles-test.py	2015-11-11 11:37:05 +0000
@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+
+# This amulet test deploys the bundles.yaml file in this directory.
+
+import os
+import unittest
+import yaml
+import amulet
+import sys
+#import urllib
+
+# Lots of prereqs on this charm (eg: java), so give it a large timeout
+seconds_to_wait = 1000
+
+
+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(series='trusty')
+   # We have a contextual test, if no config is present, initialze the
+   # test with an empty configuration set
+        config = {}
+        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('wxs').get('wxs_url')
+        print('Using URL  %s' % url)
+        # Test if a WXS url for the repository is defined
+        if not url:
+            print("You need to define a url for the IBMWXS packages repository.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+
+        basepkg = config.get('wxs').get('wxs_base_package')
+        print('Using IBMWXS base package %s' % basepkg)
+        if not basepkg:
+            print("You need to define a base package name for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+	
+	fixpkg = config.get('wxs').get('wxs_fix_pkg')
+        print('Using IBMWXS fix package %s' % fixpkg)
+        if not fixpkg:
+            print("You need to define a fix package name for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+	
+	imname = config.get('wxs').get('im_name')
+        print('Using IBMWXS IM package %s' % imname)
+        if not imname:
+            print("You need to define a IM package name for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+	sha_base_pkg = config.get('wxs').get('sha_base_pkg')
+        print('Using IBMWXS sha base package %s' % sha_base_pkg)
+        if not sha_base_pkg:
+            print("You need to define a SHA Base package  for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+	sha_fix_pkg = config.get('wxs').get('sha_fix_pkg')
+        print('Using IBMWXS sha fix package %s' % sha_fix_pkg)
+        if not sha_fix_pkg:
+            print("You need to define a SHA FIX package  for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+	sha_im_pkg = config.get('wxs').get('sha_im_pkg')
+        print('Using IBMWXS sha IM  package %s' % sha_im_pkg)
+        if not sha_im_pkg:
+            print("You need to define a SHA IM package  for IBM WXS.\n"
+              "Edit local.yaml or tests/00-setup and run it again.")
+            sys.exit(1)
+        # Software doesn't actually install until you accept the license
+        d.add('wxs')
+        d.configure('wxs', { 'accept-ibm-wxs-license': True,  'accept-ibm-im-license':True , 'wxs_url': url, 'wxs_base_package' : basepkg, 'wxs_fix_pkg':fixpkg, 'im_name':imname, 'sha_base_pkg':sha_base_pkg, 'sha_fix_pkg':sha_fix_pkg, 'sha_im_pkg':sha_im_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)
+
+if __name__ == '__main__':
+    unittest.main()

=== added file 'tests/local.yaml'
--- tests/local.yaml	1970-01-01 00:00:00 +0000
+++ tests/local.yaml	2015-11-11 11:37:05 +0000
@@ -0,0 +1,8 @@
+wxs:
+ wxs_url: "http://9.124.100.99/debs/WXS/"
+ wxs_base_package: "WS_XSCALE_V8.6_MP_ML.zip"
+ wxs_fix_pkg: "8.6.0-WS-WXS-FP0000007.zip"
+ im_name: "agent.installer.linux.gtk.x86_64_1.8.2000.20150303_1526.zip"
+ sha_base_pkg: "801bb88913e90413a271b6102d67276a9129dcf3"
+ sha_fix_pkg: "6e99ec379ed99521a184fbe0086c9d16055a67db"
+ sha_im_pkg: "f35653e20c7925d43007a1cff83623c979109ac5"