Remove charmstore from examples

cderici · cderici · commit 961cd26a7087 · 2023-01-12T14:17:06.000-07:00
diff --git a/examples/add_machine.py b/examples/add_machine.py
@@ -44,7 +44,7 @@ async def main():
 
         # deploy charm to the lxd container
         application = await model.deploy(
-            'cs:ubuntu-10',
+            'ch:ubuntu',
             application_name='ubuntu',
             series='xenial',
             channel='stable',
diff --git a/examples/add_model.py b/examples/add_model.py
@@ -29,7 +29,7 @@ async def main():
 
         print('Deploying ubuntu')
         application = await model.deploy(
-            'cs:ubuntu-10',
+            'ch:ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',
diff --git a/examples/config.py b/examples/config.py
@@ -22,7 +22,7 @@ async def main():
     await model.connect()
 
     ubuntu_app = await model.deploy(
-        'cs:mysql',
+        'ch:mysql',
         application_name='mysql',
         series='trusty',
         channel='stable',
diff --git a/examples/credential.py b/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(
diff --git a/examples/crossmodel.py b/examples/crossmodel.py
@@ -29,7 +29,7 @@ async def main():
 
         print('Deploying mysql')
         application = await offering_model.deploy(
-            'cs:mysql',
+            'ch:mysql',
             application_name='mysql',
             series='trusty',
             channel='stable',
diff --git a/examples/crossmodel_bundle.py b/examples/crossmodel_bundle.py
@@ -32,7 +32,7 @@ async def main():
 
         print('Deploying mysql')
         application_1 = await offering_model.deploy(
-            'cs:mysql-58',
+            'ch:mysql',
             application_name='mysql',
             series='xenial',
             channel='stable',
diff --git a/examples/crossmodel_controller.py b/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',
diff --git a/examples/crossmodel_relation.py b/examples/crossmodel_relation.py
@@ -32,7 +32,7 @@ async def main():
 
         print('Deploying mysql')
         application_1 = await offering_model.deploy(
-            'cs:mysql-58',
+            'ch:mysql',
             application_name='mysql',
             series='xenial',
             channel='stable',
@@ -55,7 +55,7 @@ async def main():
 
         print('Deploying wordpress')
         application_2 = await consuming_model.deploy(
-            'cs:trusty/wordpress-5',
+            'ch:trusty/wordpress',
             application_name='wordpress',
             series='xenial',
             channel='stable',
diff --git a/examples/debug-log.py b/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',
diff --git a/examples/deploy.py b/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',
diff --git a/examples/deploy_bundle.py b/examples/deploy_bundle.py
@@ -18,9 +18,6 @@ async def main():
     # Deploy charmhub bundle
     await deploy_bundle(controller, 'juju-qa-bundle-test')
 
-    # Deploy legacy bundle
-    await deploy_bundle(controller, 'cs:~juju-qa/bundle/basic-0', 'beta')
-
     await controller.disconnect()
 
 
diff --git a/examples/deploy_bundle_with_trust.py b/examples/deploy_bundle_with_trust.py
@@ -19,8 +19,7 @@ async def main():
     try:
         print('Deploying trusted bundle application ubuntu')
         applications = await model.deploy(
-            'cs:~juju-qa/bundle/basic-trusted-1',
-            channel='beta',
+            'ch:aws-integrator',
             trust=True,
         )
 
diff --git a/examples/deploy_constraints.py b/examples/deploy_constraints.py
@@ -16,7 +16,8 @@ async def main():
 
     try:
         model = await controller.add_model("test-model")
-        application = await model.deploy("cs:ubuntu", constraints={"arch": "amd64"})
+        application = await model.deploy("ch:ubuntu",
+                                         constraints={"arch": "amd64"})
 
         print('Waiting for active')
         await model.block_until(
diff --git a/examples/expose-application.py b/examples/expose-application.py
@@ -22,7 +22,7 @@ async def main():
     try:
         print('Deploying ubuntu')
         application = await model.deploy(
-            'cs:~jameinel/ubuntu-lite-7',
+            'ch:ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',
diff --git a/examples/formatted_status.py b/examples/formatted_status.py
@@ -21,7 +21,7 @@ async def main():
     await model.connect_current()
 
     application = await model.deploy(
-        'cs:ubuntu-10',
+        'ch:ubuntu',
         application_name='ubuntu',
         series='trusty',
         channel='stable',
diff --git a/examples/future.py b/examples/future.py
@@ -15,15 +15,15 @@ async def main():
 
     goal_state = Model.from_yaml('bundle-like-thing')
     ubuntu_app = await model.deploy(
-        'cs:ubuntu-0',
+        'ch:ubuntu',
         application_name='ubuntu',
         series='trusty',
         channel='stable',
     )
     ubuntu_app.on_unit_added(callback=lambda unit: True)
 
     await model.deploy(
-        'cs:nrpe-11',
+        'ch:nrpe',
         application_name='nrpe',
         series='trusty',
         channel='stable',
diff --git a/examples/relate.py b/examples/relate.py
@@ -49,7 +49,7 @@ async def main():
         model.add_observer(MyModelObserver())
 
         ubuntu_app = await model.deploy(
-            'cs:ubuntu',
+            'ch:ubuntu',
             application_name='ubuntu',
             series='trusty',
             channel='stable',
@@ -76,7 +76,7 @@ async def main():
                 print('Unit changed: {}'.format(new_unit.entity_id))
         ))
         await model.deploy(
-            'cs:nrpe',
+            'ch:nrpe',
             application_name='nrpe',
             series='trusty',
             channel='stable',
diff --git a/examples/status.py b/examples/status.py
@@ -18,7 +18,7 @@ async def main():
     await model.connect_current()
 
     application = await model.deploy(
-        'cs:ubuntu-10',
+        'ch:ubuntu',
         application_name='ubuntu',
         series='trusty',
         channel='stable',
diff --git a/examples/unitrun.py b/examples/unitrun.py
@@ -37,7 +37,7 @@ async def main():
     await model.connect()
 
     app = await model.deploy(
-        'cs:ubuntu-0',
+        'ch:ubuntu',
         application_name='ubuntu',
         series='trusty',
         channel='stable',

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ async def main():`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`application = await model.deploy(`
`23`		`- 'cs:ubuntu-10',`
	`23`	`+ 'ch:ubuntu',`
`24`	`24`	`application_name='ubuntu',`
`25`	`25`	`series='trusty',`
`26`	`26`	`channel='stable',`