Merge lp:~geethas1/charms/trusty/was-base/wasbase-fix into lp:~ibmcharmers/charms/trusty/was-base/devel

[Geetha S]

[vsr (vsasi)]

review: Approve

[lp:~geethas1/charms/trusty/was-base/wasbase-fix]

32. By Geetha S on 2015-08-04

Committing reverse proxy test case

=== modified file 'tests/10-bundles-test.py'
--- tests/10-bundles-test.py	2015-07-28 10:21:40 +0000
+++ tests/10-bundles-test.py	2015-08-04 08:54:19 +0000
@@ -40,13 +40,17 @@
          with open(bundle_path, 'r') as bundle_file:
             contents = yaml.safe_load(bundle_file)
          d.load(contents)
+         d.add('haproxy')
 
          # Software doesn't actually install until you accept the license
          d.configure('was-base', {'accept-ibm-websphere-license': True, 'accept-ibm-im-license': True,'was_url': url, 'im_file_name': pkg })
+         d.configure('haproxy', {'services': '- { service_name: was-base-service, service_host: 0.0.0.0, service_port: 9060, service_options: [balance leastconn, cookie SRVNAME insert], server_options: maxconn 100 cookie S check }'})
+         d.relate('haproxy:reverseproxy', 'was-base:website')
+         d.expose('haproxy')
          d.setup(seconds_to_wait)
          d.sentry.wait(seconds_to_wait)
          cls.d = d
-
+         
     def test_deployed(self):
          self.assertTrue(self.d.deployed)
 
@@ -56,7 +60,16 @@
          response = requests.get(url)
         # Raise an exception if the url was not a valid web page.
          response.raise_for_status()
-
+ 
+    def test_reverseproxy(self):
+         unit = self.d.sentry.unit['haproxy/0']
+         haproxy_address = unit.info['public-address']
+         haurl  = 'http://%s:9060/ibm/console' % haproxy_address
+         page = requests.get(haurl)
+         # Raise an exception if the url was not a valid web page.
+         page.raise_for_status()
+         print('Successfully got the WAS Base web page through haproxy IP address.')
+       
 if __name__ == '__main__':
     unittest.main()