Merge pull request #896 from cderici/series-local-bundle-manifest

#896

#### Description

This fixes a duplication introduced in this cherry pick bd06a24, and adds functionality to determine series using utils for base, which already has the logic for checking `manifest.yaml` for bases (alongside with `metadata.yaml` etc).

Fixes #891 


#### QA Steps

This adds the simplified version of the scenario in #891 as an integration test, so the following should pass:

```sh
tox -e integration -- tests/integration/test_model.py::test_deploy_bundle_local_charm_series_manifest
```

**Alternatively**, get the onos charm:

```sh
wget https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages/-/raw/master/charm-packages/pebble_charm_vnf/juju-bundles/charms/onos_ubuntu-20.04-amd64.charm
```

Write the following in a `bundle.yaml`:

```yaml
description: Onos Bundle
bundle: kubernetes
applications:
 onos:
 charm: './onos_ubuntu-20.04-amd64.charm'
 scale: 1
 options:
 admin-password: admin
 resources:
 onos-image: onosproject/onos:2.6.0
```

Deploy with this change, should go through just fine without complaining about the series:

```sh
$ python -m asyncio
asyncio REPL 3.10.6 (main, May 29 2023, 11:10:38) [GCC 11.3.0] on linux
Use "await" directly instead of "asyncio.run()".
Type "help", "copyright", "credits" or "license" for more information.
>>> import asyncio
>>> from juju import model;m=model.Model();await m.connect();await m.deploy('./bundle.yaml')
unknown facade AgentLifeFlag
unexpected facade AgentLifeFlag found, unable to decipher version to use
[<Application entity_id="onos">]
>>>
```

Author: jujubot

juju/bundle.py

@@ -127,8 +127,9 @@ async def _handle_local_charms(self, bundle, bundle_dir):
                 metadata = utils.get_local_charm_metadata(charm_dir)
                 series = await get_charm_series(metadata, self.model)
             if not series:
-                metadata = utils.get_local_charm_metadata(charm_dir)
-                series = await get_charm_series(metadata, self.model)
+                base = utils.get_local_charm_base(None, charm_path, client.Base)
+                series = utils.base_channel_to_series(base.channel)
+            if not series:
                 raise JujuError(
                     "Couldn't determine series for charm at {}. "
                     "Add a 'series' key to the bundle.".format(charm_dir))

tests/integration/bundle/local-manifest.yaml

@@ -0,0 +1,4 @@
+applications:
+  test1:
+    charm: "../charm-manifest"
+    num_units: 1

tests/integration/charm-manifest/config.yaml

@@ -0,0 +1,4 @@
+options:
+  status:
+    type: string
+    default: "active"

tests/integration/charm-manifest/dispatch

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+status="$(config-get status)"
+
+if [[ "$status" == "error" ]]; then
+    if [[ -e .errored ]]; then
+        status="active"
+    else
+        touch .errored
+        exit 1
+    fi
+fi
+status-set "$status"

tests/integration/charm-manifest/manifest.yaml

@@ -0,0 +1,13 @@
+analysis:
+  attributes:
+  - name: language
+    result: python
+  - name: framework
+    result: operator
+bases:
+- architectures:
+  - amd64
+  channel: '20.04'
+  name: ubuntu
+charmcraft-started-at: '2021-08-20T08:09:00.639806Z'
+charmcraft-version: 1.2.1

tests/integration/charm-manifest/metadata.yaml

@@ -0,0 +1,4 @@
+name: charm
+summary: "test"
+description: "test"
+maintainers: ["test"]

tests/integration/test_model.py

@@ -127,6 +127,19 @@ async def test_deploy_bundle_local_charms(event_loop):
         assert model.units['test2/0'].workload_status == 'active'
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_deploy_bundle_local_charm_series_manifest(event_loop):
+    bundle_path = TESTS_DIR / 'integration' / 'bundle' / 'local-manifest.yaml'
+
+    async with base.CleanModel() as model:
+        await model.deploy(bundle_path)
+        await wait_for_bundle(model, bundle_path)
+        assert set(model.units.keys()) == set(['test1/0'])
+        assert model.units['test1/0'].agent_status == 'idle'
+        assert model.units['test1/0'].workload_status == 'active'
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_deploy_invalid_bundle(event_loop):