Merge lp:~johnsca/charms/trusty/ibm-java/layer-review into lp:~ibmcharmers/charms/trusty/ibm-java/source

[Cory Johns]

Recommended changes from review:

  * Fix lint errors in tests
  * Create archive dir if doesn't exist (gets dropped during `charm build`)
  * Improve error handling for download in expect script

[lp:~johnsca/charms/trusty/ibm-java/layer-review]

4. By Cory Johns on 2016-02-29

Remove unnecessary java-major config option

[Prabakaran (prabacha)]

review: Approve

=== modified file 'README.md'
--- README.md	2016-02-15 08:55:57 +0000
+++ README.md	2016-02-29 18:53:05 +0000
@@ -125,9 +125,6 @@
     should be altered by the user only when the package name is change. Else it
     should not be altered.
 
-- **java-major** Major version of Java. If not
-    set, it will be assigned to the default value 1.8.0.
-
 - **install-type** Type of install to perform. Valid options are 'jre' or 'full'. 
     The default is 'jre', which will install the IBM Java Runtime Environment (JRE). 
     Setting this to 'full' will install the IBM Java Development Kit in addition to the JRE.
 
=== modified file 'config.yaml'
--- config.yaml	2016-02-15 08:55:57 +0000
+++ config.yaml	2016-02-29 18:53:05 +0000
@@ -55,11 +55,6 @@
       the integrity check. Refer README file to find out Checksum value for
       downloaded package. Cryptographic value should be altered by the user
       only when the package name is change. Else it should not be altered.
-  java-major:
-    type: string
-    default: 1.8.0
-    description: |
-      Major version of Java. Defaults to 1.8.0.
   install-type:
     type: string
     default: jre
 
=== modified file 'files/sftp_get.sh'
--- files/sftp_get.sh	2016-02-15 08:55:57 +0000
+++ files/sftp_get.sh	2016-02-29 18:53:05 +0000
@@ -10,11 +10,9 @@
 set localpath [lindex $argv 4]
 
 set timeout 90
-spawn sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $user@$host
+spawn sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null $user@$host:$r_dir $localpath
 expect "password:"
 send "$password\n"
-expect "sftp>"
 set timeout 3000
-send "get -r $r_dir $localpath\n"
-expect "sftp>"
-send "exit\n"
+catch wait result
+exit [lindex $result 3]
 
=== modified file 'reactive/install'
--- reactive/install	2016-02-15 08:55:57 +0000
+++ reactive/install	2016-02-29 18:53:05 +0000
@@ -179,8 +179,10 @@
 @when 'java.connected' 'license.accepted'
 @when_not 'java.installed'
 function install() {
-	java_major=$(config-get 'java-major')
 	install_type=$(config-get 'install-type')
+	if [[ ! -d $ARCHIVE_DIR ]]; then
+		mkdir $ARCHIVE_DIR
+	fi
 	cd $ARCHIVE_DIR
 	echo -e "LICENSE_ACCEPTED=TRUE\nUSER_INSTALL_DIR=$JAVA_INSTALL_PATH\nINSTALLER_UI=silent" > installer.properties
 	download_java
@@ -209,7 +211,7 @@
 	relation_call --state=java.connected set_ready $java_home $java_version
 
 	set_state 'java.installed'
-	status-set active "IBM Java ${java_major} installed"
+	status-set active "IBM Java ${java_version} installed"
 	java -version
 	if [ $? == 0 ]; then
 		if [[ ${install_type} == "full" ]]; then
@@ -229,10 +231,12 @@
 }
 
 @when 'java.connected' 'java.installed' 'license.accepted'
+@when 'config.changed'
 function check_version() {
-	java_major=$(config-get 'java-major')
-	java_major_installed=$(java -version 2>&1 | grep -i version | head -n 1 | awk -F '"' '{print $2}')
-	if [[ $java_major != $java_major_installed ]]; then
+	if charms.reactive is_state 'config.changed.java_path_name' || \
+           charms.reactive is_state 'config.changed.install-type' || \
+           charms.reactive is_state 'config.changed.java_file_name' || \
+           charms.reactive is_state 'config.changed.sha'; then
 		status-set maintenance "Uninstalling all IBM Java versions before installing new one"
 		remove_java_software
 		install
 
=== modified file 'tests/10-bundles-test.py' (properties changed: -x to +x)
--- tests/10-bundles-test.py	2016-02-15 08:55:57 +0000
+++ tests/10-bundles-test.py	2016-02-29 18:53:05 +0000
@@ -7,7 +7,6 @@
 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
@@ -103,7 +102,8 @@
             cmd = "java -version"
             output, code = ibmjava_unit.run(cmd)
             if code != 0:
-                message = 'Unable to run Java Command: As java is not installed or appropriate path variable is not set.'
+                message = 'Unable to run Java Command: As java is not ' \
+                          'installed or appropriate path variable is not set.'
                 amulet.raise_status(amulet.FAIL, msg=message)
         else:
             ibmjava_unit.run('mkdir -m a=rwx /home/test')
@@ -121,7 +121,8 @@
             output, code = ibmjava_unit.run(cmd)
             print('Output of simple java program is  %s' % output)
             if code != 0:
-                message = 'Unable to run Java Program: As java is not installed or appropriate path variable is not set.'
+                message = 'Unable to run Java Program: As java is not ' \
+                          'installed or appropriate path variable is not set.'
                 amulet.raise_status(amulet.FAIL, msg=message)
 
 if __name__ == '__main__':