Update old bundles and test cases to use charmhub

Author: cderici

tests/bundle/bundle.yaml

@@ -1,15 +1,19 @@
 series: xenial
-services:
+applications:
   wordpress:
-    charm: "cs:trusty/wordpress-2"
+    charm: "wordpress"
+    series: "xenial"
+    channel: "candidate"
     num_units: 1
     annotations:
       "gui-x": "339.5"
       "gui-y": "-171"
     to:
       - "0"
   mysql:
-    charm: "cs:trusty/mysql-26"
+    charm: "mysql"
+    series: "trusty"
+    channel: "candidate"
     num_units: 1
     annotations:
       "gui-x": "79.5"
@@ -21,7 +25,7 @@ relations:
     - "mysql:db"
 machines:
   "0":
-    series: trusty
+    series: xenial
     constraints: "arch=amd64 cores=1 cpu-power=100 mem=1740 root-disk=8192"
   "1":
     series: trusty

tests/integration/test_application.py

@@ -241,7 +241,7 @@ async def test_trusted(event_loop):
 @pytest.mark.asyncio
 async def test_app_remove_wait_flag(event_loop):
     async with base.CleanModel() as model:
-        app = await model.deploy('cs:ubuntu')
+        app = await model.deploy('ubuntu')
         a_name = app.name
         await model.wait_for_idle(status="active")