Merge pull request #786 from cderici/no-charmstore-on-libjuju

#786

#### Description

This is the final major step in removing the CharmStore support from juju.

Being part of the [Disallow charmstore charms in 3.1+](https://warthogs.atlassian.net/browse/JUJU-2201) epic, this is related to PRs such as juju/juju#15013, juju/juju#15045, juju/juju#14996, etc.

#### QA Steps

As there's no more charmstore charm support in Juju anyways, this PR doesn't really change any behavior. However, all the rest of the functionality should be working fine, so current tests should pass without any issues.

#### Notes & Discussion

This also removes references for the `theblues` library as we no longer need it to access the charmstore.

Author: jujubot

examples/add_machine.py

@@ -30,30 +30,28 @@ async def main():
                 'mem': 256 * MB,
             },
             disks=[{
-                'pool': 'rootfs',
                 'size': 10 * GB,
                 'count': 1,
             }],
-            series='xenial',
+            series='jammy',
         )
+
         # add a lxd container to machine2
         machine3 = await model.add_machine(
             'lxd:{}'.format(machine2.id),
-            series='xenial'
+            series='jammy'
         )
 
         # deploy charm to the lxd container
         application = await model.deploy(
-            'cs:ubuntu-10',
+            'ch:ubuntu',
             application_name='ubuntu',
-            series='xenial',
+            series='jammy',
             channel='stable',
             to=machine3.id
         )
 
-        await model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for unit in application.units))
+        await model.wait_for_idle(status='active')
 
         await application.remove()
 

examples/add_model.py

@@ -29,17 +29,15 @@ async def main():
 
         print('Deploying ubuntu')
         application = await model.deploy(
-            'cs:ubuntu-10',
+            'ch:ubuntu',
             application_name='ubuntu',
-            series='trusty',
+            series='jammy',
             channel='stable',
         )
 
         print('Waiting for active')
         await asyncio.sleep(10)
-        await model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for unit in application.units))
+        await model.wait_for_idle(status='active')
 
         print("Verifying that we can ssh into the created model")
         ret = await utils.execute_process(

examples/config.py

@@ -22,33 +22,38 @@ async def main():
     await model.connect()
 
     ubuntu_app = await model.deploy(
-        'cs:mysql',
+        'mysql',
         application_name='mysql',
-        series='trusty',
-        channel='stable',
+        series='jammy',
+        channel='edge',
         config={
-            'tuning-level': 'safest',
+            'cluster-name': 'foo',
         },
         constraints={
             'mem': 256 * MB,
         },
     )
+    await model.wait_for_idle(status='active')
 
     # update and check app config
-    await ubuntu_app.set_config({'tuning-level': 'fast'})
+    await ubuntu_app.set_config({'cluster-name': 'bar'})
     config = await ubuntu_app.get_config()
-    assert (config['tuning-level']['value'] == 'fast')
+    assert (config['cluster-name']['value'] == 'bar')
 
     # update and check app constraints
     await ubuntu_app.set_constraints({'mem': 512 * MB})
     constraints = await ubuntu_app.get_constraints()
     assert (constraints['mem'] == 512 * MB)
 
+    print('Removing mysql')
+    await ubuntu_app.remove()
+
+    print('Disconnecting from model')
     await model.disconnect()
 
 
 if __name__ == '__main__':
-    logging.basicConfig(level=logging.DEBUG)
+    # logging.basicConfig(level=logging.DEBUG)
     ws_logger = logging.getLogger('websockets.protocol')
     ws_logger.setLevel(logging.INFO)
     jasyncio.run(main())

examples/credential.py

@@ -22,7 +22,7 @@ async def main(cloud_name, credential_name):
 
         # verify we can deploy
         print('Deploying ubuntu')
-        app = await model.deploy('cs:ubuntu-10')
+        app = await model.deploy('ch:ubuntu')
 
         print('Waiting for active')
         await model.block_until(

examples/crossmodel.py

@@ -29,10 +29,10 @@ async def main():
 
         print('Deploying mysql')
         application = await offering_model.deploy(
-            'cs:mysql',
+            'ch:mysql',
             application_name='mysql',
-            series='trusty',
-            channel='stable',
+            series='jammy',
+            channel='edge',
         )
 
         print('Waiting for active')

examples/crossmodel_bundle.py

@@ -31,17 +31,15 @@ async def main():
         consuming_model = await controller.add_model('test-cmr-2')
 
         print('Deploying mysql')
-        application_1 = await offering_model.deploy(
-            'cs:mysql-58',
+        await offering_model.deploy(
+            'ch:mysql',
             application_name='mysql',
-            series='xenial',
-            channel='stable',
+            series='jammy',
+            channel='edge',
         )
 
         print('Waiting for active')
-        await offering_model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for unit in application_1.units))
+        await offering_model.wait_for_idle(status='active')
 
         print('Adding offer')
         await offering_model.create_offer("mysql:db")

examples/crossmodel_controller.py

@@ -37,7 +37,7 @@ async def main():
 
         print('Deploying mysql')
         application = await offering_model.deploy(
-            'cs:mysql',
+            'ch:mysql',
             application_name='mysql',
             series='trusty',
             channel='stable',

examples/crossmodel_relation.py

@@ -31,17 +31,15 @@ async def main():
         consuming_model = await controller.add_model('test-cmr-2')
 
         print('Deploying mysql')
-        application_1 = await offering_model.deploy(
-            'cs:mysql-58',
+        await offering_model.deploy(
+            'ch:mysql',
             application_name='mysql',
-            series='xenial',
-            channel='stable',
+            series='jammy',
+            channel='edge',
         )
 
         print('Waiting for active')
-        await offering_model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for unit in application_1.units))
+        await offering_model.wait_for_idle(status='active')
 
         print('Adding offer')
         await offering_model.create_offer("mysql:db")
@@ -53,9 +51,11 @@ async def main():
 
         print('Show offers', ', '.join("%s: %s" % item for offer in offers.results for item in vars(offer).items()))
 
+        # TODO (cderici): wordpress charm is somewhat problematic in 3.0,
+        #  this example needs to be revisited.
         print('Deploying wordpress')
         application_2 = await consuming_model.deploy(
-            'cs:trusty/wordpress-5',
+            'ch:trusty/wordpress',
             application_name='wordpress',
             series='xenial',
             channel='stable',

examples/debug-log.py

@@ -20,7 +20,7 @@ async def main():
     )
 
     application = await model.deploy(
-        'cs:ubuntu-10',
+        'ch:ubuntu',
         application_name='ubuntu',
         series='trusty',
         channel='stable',

examples/deploy.py

@@ -19,7 +19,7 @@ async def main():
     try:
         print('Deploying ubuntu')
         application = await model.deploy(
-            'cs:ubuntu-10',
+            'ch:ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',