Merge lp:~kwmonroe/charms/trusty/layer-ibm-im/switch-to-resources into lp:~ibmcharmers/charms/trusty/layer-ibm-im/trunk

[Kevin W Monroe]

Switch to Juju Resources and Terms instead of requiring curl and license config options.

[lp:~kwmonroe/charms/trusty/layer-ibm-im/switch-to-resources]

13. By Kevin W Monroe on 2016-06-07

update fixpack placeholder description

14. By Kevin W Monroe on 2016-06-07

update tests since we can test charm deployment with a placeholder resource

15. By Kevin W Monroe on 2016-06-07

be more explicity with log/status messages

16. By Kevin W Monroe on 2016-06-21

never let the grep fail when detecting an empty fixpack (set -e will make the hook fail on subshell failures); make check-fixpack only run during upgrade-charm (otherwise it ran on update-status, every 5 minutes)

17. By Kevin W Monroe on 2016-06-21

use underscores instead of hyphens in function names

18. By Kevin W Monroe on 2016-06-21

fixup last commit (missed an extra ibm_im_fp_empty assignment)

19. By Kevin W Monroe on 2016-06-23

update sentry message for placeholder resource test

20. By Kevin W Monroe on 2016-06-23

tweak sentry status message in amulet test

21. By Kevin W Monroe on 2016-06-23

change upgrade-charm hook logic

The first time a fixpack resource was uploaded, the upgrade-charm hook would
fetch it, md5sum it, and compare that sum to a bogus previous value (because
there was no previous valid fixpack). This sum mismatch triggered the install
of a new fixpack, which goes out to re-fetch it. The double-fetch on initial
fixpack (first in upgrade-charm, then in install_ibm_im_fixpack) is
inefficient.

Instead, upgrade-charm now checks for the ibm-im.updated state, which is only
set when a fixpack gets installed. On initial fixpack upload, this state will
not be set, so we avoid the double fetch.

[Shruthima (salmavar)]

review: Approve

=== modified file 'README.md'
--- README.md	2016-05-05 10:58:11 +0000
+++ README.md	2016-06-23 19:40:22 +0000
@@ -1,210 +1,115 @@
-## 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:
-
-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.
-
-### 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:
-
-    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
-    }
-
-
-
-### 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])
+# IBM Installation Manager (IM)
+
+IBM Installation Manager (IM) 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).
+
+
+## Prerequisites
+
+This charm makes use of resources, a feature only available in Juju 2.0. During
+deploy or upgrade, you will need to specify the installable package(s)
+required by this charm. Download your licensed IBM Installation Manager
+packages from the [Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142).
+
+### Package for Ubuntu on AMD64 (x86_64):
+
+IBM Installation Manager 1.8 (`agent.installer.linux.gtk.x86_64_1.8.3000.20150606_0047.zip`)
+
+### Package for Ubuntu on Power (ppc64le):
+
+IBM Installation Manager 1.8 (`agent.installer.linux.gtk.ppc64le_1.8.1000.20141126_2002.zip`)
+
+## Usage
+
+To use this charm, you must agree to the Terms of Use. 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)
+page.
+
+Search for "IBM Installation Manager" and choose the license that applies to
+the version you are using.
+
+### Deploy
+
+Run the following commands to deploy this charm:
+
+    juju deploy ibm-im --resource ibm_im_installer=</path/to/installer.zip>
+
+**Note**: This charm requires acceptance of Terms of Use. When deploying from
+the Charm Store, these terms will be presented to you for your consideration.
+To accept the terms:
+
+    juju agree somePlan/1
+
+### Upgrade
+
+Once deployed, users can install fixpacks by upgrading the charm:
+
+    juju upgrade-charm ibm-im --resource ibm_im_fixpack=</path/to/fixpack.zip>
+
+### Verification
+
+Once deployed, you can use IBM IM to install any IBM products. To verify IM is
+installed, list the contents of the installation directory:
+
+    juju run --service ibm-im 'ls /opt/IBM/InstallationManager'
+
+
+## Additional information
+
+### General
+
+Details about IBM Installation Manager are available
+[here](http://www.ibm.com/support/knowledgecenter/SSDV2W/im_family_welcome.html).
+
+### Download
+
+Information on procuring IBM IM product is available at the
+[Product Page](http://www-01.ibm.com/support/docview.wss?uid=swg27025142).
+
+### License
+
+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).
+
+### Developers
+
+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-im']
+```
+
+Then in your charm, watch for the `ibm-im.installed` state, at which point you
+will know the IBM IM tools are available:
+
+```sh
+IM_PATH=/opt/IBM/InstallationManager
+
+@when 'ibm-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
+}
+```
+
+## Known Limitations
+
+This charm makes use of Juju features that are only available in version 2.0 or
+greater.
+
+## Contact Information
+
+For issues with this charm, please contact [IBM Juju Support Team](mailto:[e-mail])

=== removed file 'config.yaml'
--- config.yaml	2016-04-25 07:15:10 +0000
+++ config.yaml	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-options:
-    ibm_im_fp_package:
-      type: string
-      default: ""
-      description: |
-        Name of the IBM IM Fixpack  package.

=== modified file 'layer.yaml'
--- layer.yaml	2016-04-25 07:15:10 +0000
+++ layer.yaml	2016-06-23 19:40:22 +0000
@@ -1,3 +1,4 @@
+repo: bzr+ssh://bazaar.launchpad.net/~ibmcharmers/charms/trusty/layer-ibm-im/trunk/
 includes: ['layer:ibm-base']
 options:
  basic:

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-04-25 07:15:10 +0000
+++ metadata.yaml	2016-06-23 19:40:22 +0000
@@ -1,9 +1,20 @@
 name: ibm-im
-summary: IBM Java IM Product
+summary: IBM Installation Manager
 maintainer: IBM Juju Support Team <[e-mail]>
 description: |
-  IBM IM is an installation tool, which helps you to install many IBM products.
+  IBM IM is an installation tool that helps install many IBM products.
 tags:
 - ibm
 - im
 subordinate: false
+resources:
+  ibm_im_installer:
+    type: file
+    filename: ibm_im_installer.zip
+    description: Installation Manager installer archive
+  ibm_im_fixpack:
+    type: file
+    filename: ibm_im_fixpack.zip
+    description: Installation Manager fix pack archive
+terms:
+  - lorem-ipsum/1

=== modified file 'reactive/ibm-im.sh'
--- reactive/ibm-im.sh	2016-05-05 10:58:11 +0000
+++ reactive/ibm-im.sh	2016-06-23 19:40:22 +0000
@@ -1,166 +1,187 @@
 #!/bin/bash
-set -ex
+set -e
 
 source charms.reactive.sh
-ARCHIVE_DIR=files/archives
 ARCHITECTURE=`uname -m`
 
 # Installation Manager install path
 IM_INSTALL_PATH="/opt/IBM/InstallationManager"
 
-
-@when 'ibm-base.license.accepted' 'ibm-base.curl.resource.fetched'
 @when_not 'ibm-im.installed'
-function install-ibm-im(){
-# 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."
+function install_ibm_im(){
+      # Fail fast if we're on an unsupported arch
+      if [ "$ARCHITECTURE" != "x86_64" -a  "$ARCHITECTURE" != "ppc64le" ]; then
+            juju-log "IBM IM: only supported on x86_64 or ppc64le platforms"
+            status-set blocked "unsupported architecture"
+            exit 1
+      fi
+
+      # Get the installable resource
+      juju-log "IBM IM: fetching the ibm_im_installer resource"
+      status-set maintenance "fetching the ibm_im_installer resource"
+      cfg_im_pkg_name=`resource-get 'ibm_im_installer' || echo unavailable`
+
+      # If we don't have a package, report blocked status; we can't proceed.
+      if [ "$cfg_im_pkg_name" = "unavailable" ]; then
+        juju-log "IBM IM: missing required ibm_im_installer resource"
+        status-set blocked "missing required ibm_im_installer resource"
+        exit 0
+      fi
+
+      juju-log "IBM IM: using $cfg_im_pkg_name as the ibm_im_installer resource"
+      ARCHIVE_DIR=`dirname $cfg_im_pkg_name`
+
+      # Extract the installer contents
+      if [ -f  $cfg_im_pkg_name ]; then
+           juju-log "IBM IM: extracting the ibm_im_installer resource"
+           status-set maintenance "extracting the ibm_im_installer resource"
+           if [ -f $ARCHIVE_DIR/userinstc ]; then
+                 juju-log "IBM IM: ibm_im_installer resource already extracted"
            else
-                 cd $CHARM_DIR/$ARCHIVE_DIR
-
-                 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."
+                 cd $ARCHIVE_DIR
+                 if ! unzip $cfg_im_pkg_name; then
+                      juju-log "IBM IM: Unable to extract the ibm_im_installer resource"
                       # Remove corrupt archive file
-                      status-set blocked "IBM Installation Manager package is corrupt"
-                      rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$im_pkg_name
+                      status-set blocked "ibm_im_installer resource is corrupt"
+                      rm -rf $ARCHIVE_DIR
                       exit 0
                  else
-                      juju-log "IBM IM: Installation Manager extracted successfully."
+                      juju-log "IBM IM: ibm_im_installer resource 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
+      fi
 
-      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"
+      # Do the actual IBM IM install
+      if [ -f  $ARCHIVE_DIR/userinstc ]; then
+        juju-log "IBM IM: starting installation."
+        status-set maintenance "installing ibm-im"
+        cp $ARCHIVE_DIR/install.xml $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>" $ARCHIVE_DIR/silent_install.xml
+        if $ARCHIVE_DIR/userinstc -input $ARCHIVE_DIR/silent_install.xml -acceptlicense; then
+            set_state 'ibm-im.installed'
+            status-set active "ready"
+        else
+            juju-log "IBM IM: error while installing"
+            exit 1
+        fi
       else
-        juju-log "IBM IM: Error while installing  IM"
+        juju-log "IBM IM: installer was not found."
+        status-set blocked "installation failed"
         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
-  }
-
-  
-@when 'ibm-im.installed' 'config.set.ibm_im_fp_package'
+}
+
+@when 'ibm-im.installed'
 @when_not 'ibm-im.updated'
-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 
-      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
-             cd $CHARM_DIR/$ARCHIVE_DIR
-                  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."
+function install_ibm_im_fixpack(){
+    # Get the fixpack resource
+    juju-log "IBM IM: fetching the ibm_im_fixpack resource"
+    status-set maintenance "fetching the ibm_im_fixpack resource"
+    ibm_im_fp_package=`resource-get 'ibm_im_fixpack' || echo unavailable`
+
+    # If we don't have a fixpack, just exit successfully; there's nothing to do.
+    if [ "$ibm_im_fp_package" = "unavailable" ]; then
+      juju-log "IBM IM: no ibm_im_fixpack to install"
+      status-set active "ready"
+      exit 0
+    fi
+
+    # Currently, there is no way to make a resource optional, so something
+    # must be uploaded to the charm store, even if it's a dummy archive.
+    # If we detect the fixpack is just a placeholder (because we created an
+    # empty placeholder in the store), exit just like we do with a missing
+    # fixpack resource.
+    ibm_im_fp_empty=`file $ibm_im_fp_package | { grep -q empty && echo "True"; } || echo "False"`
+    if [ "$ibm_im_fp_empty" = "True" ]; then
+      juju-log "IBM IM: no ibm_im_fixpack to install"
+      status-set active "ready"
+      exit 0
+    fi
+
+    juju-log "IBM IM: using $ibm_im_fp_package as the ibm_im_fixpack resource"
+    ARCHIVE_DIR=`dirname $ibm_im_fp_package`
+
+    # Extract the fixpack contents
+    if [ -f $ibm_im_fp_package ]; then
+        juju-log "IBM IM: extracting the ibm_im_fixpack resource"
+        status-set maintenance "extracting the ibm_im_fixpack resource"
+        if [ -f $ARCHIVE_DIR/userinstc ]; then
+              juju-log "IBM IM: ibm_im_fixpack resource already extracted"
+        else
+              cd $ARCHIVE_DIR
+              if ! unzip $ibm_im_fp_package; then
+                      juju-log "IBM IM: Unable to extract the ibm_im_fixpack resource"
                       # Remove corrupt archive file
-                      status-set blocked "IBM Installation Manager fixpack package is corrupt"
-                      rm  -f  $CHARM_DIR/$ARCHIVE_DIR/$ibm_im_fp_package
+                      status-set blocked "ibm_im_fixpack resource is corrupt"
+                      rm  -rf $ARCHIVE_DIR
                       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'
-                  
-                 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"
+              else
+                      juju-log "IBM IM: ibm_im_fixpack resource extracted successfully"
+              fi
+        fi
+    fi
+
+    # Do the actual IBM IM fixpack install
+    if [ -f $ARCHIVE_DIR/userinstc ]; then
+        juju-log "IBM IM: starting fixpack installation."
+        status-set maintenance "installing fixpack"
+        cp $ARCHIVE_DIR/install.xml $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>" $ARCHIVE_DIR/silent_install.xml
+        if $ARCHIVE_DIR/userinstc -input $ARCHIVE_DIR/silent_install.xml -acceptlicense; then
+             set_state 'ibm-im.updated'
+             status-set active "ready"
+        else
+             juju-log "IBM IM: error while installing the fixpack."
+             exit 1
+        fi
+    else
+        juju-log "IBM_IM: Fix pack installer was not found."
+        status-set blocked "fixpack installation 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'
-     
-}
-
-@when 'ibm-im.installed'
-@when_not 'ibm-base.license.accepted'
-function uninstall() {
-    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"
-}
+}
+
+@hook 'upgrade-charm'
+function check_fixpack(){
+    # The upgrade-charm hook will fire when a new resource is pushed for this
+    # charm. This is a good time to determine if we need to deal with a new
+    # fixpack.
+    if ! charms.reactive is_state 'ibm-im.updated'; then
+        # If there is no prior fixpack installed (because ibm-im.updated is not
+        # set), do nothing since install-ibm-im-fixpack will handle that case.
+        juju-log "IBM IM: no fixpack has been installed; nothing to upgrade."
+        exit 0
+    else
+        # If we have a fixpack already (because ibm-im.updated is set),
+        # we should fetch the latest fixpack and determine if it is new.
+        #  - If it is new, set our states so install-ibm-im-fixpack is called again
+        #  - If it is not new, do nothing
+        juju-log "IBM IM: scanning for new fixpacks to install"
+        ARCHIVE_DIR="$CHARM_DIR/../resources/ibm_im_fixpack"
+        CUR_FIXPACK="$ARCHIVE_DIR/ibm_im_fixpack.zip"
+
+        # Sum any existing fixpack to determine if we have a new one
+        if [ -f $CUR_FIXPACK ]; then
+            CUR_MD5=`md5sum "$CUR_FIXPACK" | awk '{print $1}'`
+            # Calling resource-get here will fetch the fixpack resource.
+            NEW_FIXPACK=`resource-get 'ibm_im_fixpack' || echo unavailable`
+            if [ "$NEW_FIXPACK" = "unavailable" ]; then
+                juju-log "IBM IM: no fixpack to install"
+            else
+                NEW_MD5=`md5sum "$NEW_FIXPACK" | awk '{print $1}'`
+                # If sums don't match, we have a new fp. Configure states so
+                # we re-run install-ibm-im-fixpack().
+                if [ "$CUR_MD5" != "$NEW_MD5" ]; then
+                    juju-log "IBM IM: new fixpack detected ($CUR_FIXPACK with $CUR_MD5 versus $NEW_FIXPACK with $NEW_MD5)"
+                    rm -rf $ARCHIVE_DIR
+                    remove_state 'ibm-im.updated'
+                else
+                    juju-log "IBM IM: no new fixpack to install"
+                fi
+            fi
+        fi
+    fi
+}
+
 
 reactive_handler_main

=== removed file 'tests/00-setup'
--- tests/00-setup	2016-04-25 07:15:10 +0000
+++ tests/00-setup	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-
-IM_CURL_URL=${IM_CURL_URL?Error: IBM IM  curl_url be defined in tests/00-setup}
-IM_CURL_OPTS=${IM_CURL_OPTS?Error: IBM IM  curl_OPTS be defined in tests/00-setup}
-IM_LICENSE=${IM_LICENSE?Error: IBM IM License accepted value must be defined in tests/00-setup}
-IM_FP_PACKAGE=${IM_FP_PACKAGE?Error: IBM IM FP Package value must be defined in tests/00-setup}
-
-# Add a local configuration file
-cat << EOF > local.yaml
-im:
-    im_curl_url: "$IM_CURL_URL"
-    im_curl_opts: "$IM_CURL_OPTS"
-    im_license_accepted: "$IM_LICENSE"
-    im_ibm_im_fp_package: "$IM_FP_PACKAGE"
-EOF
-
-sudo add-apt-repository ppa:juju/stable -y
-sudo apt-get update
-sudo apt-get -y install unzip
-sudo apt-get install amulet python3 -y

=== added file 'tests/01-deploy.py'
--- tests/01-deploy.py	1970-01-01 00:00:00 +0000
+++ tests/01-deploy.py	2016-06-23 19:40:22 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import amulet
+import re
+import unittest
+
+
+class TestDeploy(unittest.TestCase):
+    """
+    Deployment test for the IBM IM charm.
+
+    This charm doesn't do much by itself, so we expect functional
+    tests to happen in the charms that use this layer (for example, websphere).
+    """
+    def setUp(self):
+        self.d = amulet.Deployment(series='trusty')
+        self.d.add('ibm-im', 'cs:~ibmcharmers/trusty/ibm-im')
+        self.d.setup(timeout=900)
+        self.d.sentry.wait(timeout=1800)
+
+    def test_deploy_with_placeholder_resource(self):
+        # The status message when using placeholder resources will include the
+        # string "ibm_im_installer resource". If we see that, the test is
+        # successful.
+        sentry_re = re.compile('ibm_im_installer resource')
+        self.d.sentry.wait_for_messages({"ibm-im": sentry_re})
+
+if __name__ == '__main__':
+    unittest.main()

=== removed file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2016-04-25 07:15:10 +0000
+++ tests/10-bundles-test.py	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-#!/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 time
-import requests
-
-# Lots of prereqs on this charm so give it a large timeout accordingly
-seconds_to_wait = 20000
-
-
-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(juju_env='local', series='trusty')
-        local_path = os.path.join(os.path.dirname(__file__), 'local.yaml')
-        with open(local_path, "r") as fd:
-            config = yaml.safe_load(fd)
-
-        curl_url = config.get('im').get('im_curl_url')
-        print('Using im_curl_url  %s' % curl_url)
-        # Test if a IBM im curl url is defined
-        if not curl_url:
-            print("You need to define a im_curl_url.\n"
-                  "Edit local.yaml or tests/00-setup and run it again.")
-            sys.exit(1)
-
-        curl_opts = config.get('im').get('im_curl_opts')
-        print('Using im_curl_opts  %s' % curl_opts)
-        # Test if IBM  curl_opts is defined
-        if not curl_opts:
-            print("You need to define a curl_opts."
-                  " repository.\n Edit local.yaml or tests/00-setup"
-                  " and run it again.")
-            sys.exit(1)
-
-        license_accepted = config.get('im').get('im_license_accepted')
-        print('Using license_accepted  %s' % license_accepted)
-        # Test if a license_accepted is defined
-        if not license_accepted:
-            print("You need to define a license_accepted for the IBM IM product"
-                  " repository.\n Edit local.yaml or tests/00-setup"
-                  " and run it again.")
-            sys.exit(1)
-
-        ibm_im_fp_package = config.get('im').get('im_ibm_im_fp_package')
-        print('Using ibm_im_fp_package  %s' % ibm_im_fp_package)
-        # Test if a password for the repository is defined
-        if not ibm_im_fp_package:
-           print("You need to define a ibm_im_fp_package for the IBM IM updation"
-                  " repository.\n Edit local.yaml or tests/00-setup"
-                  " and run it again.")
-           sys.exit(1)
-			
-        d.add('ibm-im')
-        
-        # Software doesn't actually install until you accept the license
-        d.configure('ibm-im', {'license_accepted': license_accepted,
-                                 'curl_url': curl_url,
-                                 'curl_opts': curl_opts,
-                                 'ibm_im_fp_package': ibm_im_fp_package})
-        
-        d.setup(seconds_to_wait)
-        d.sentry.wait(seconds_to_wait)
-        cls.d = d
-
-    def test_deployed(self):
-        self.assertTrue(self.d.deployed)
-        unit = self.d.sentry['ibm-im'][0]
-        cmd = "cd /opt/IBM/InstallationManager"
-        output, code = unit.run(cmd)
-        if code != 0:
-           message = 'IM is not installed as im path doesnt exist'
-           amulet.raise_status(amulet.FAIL, msg=message)
-	        
-if __name__ == '__main__':
-    unittest.main()

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2016-06-23 19:40:22 +0000
@@ -0,0 +1,4 @@
+packages:
+  - amulet
+  - python3
+  - unzip