Merge pull request #887 from cderici/avoid-parsing-endpoint-for-overlay-offers

#887

#### Description

This is an addendum PR on #817, that attempts to fix #816.

So the main thing here is that we don't accept endpoints that are not in `"<application-name>:<endpoint-name>[,...]"` format, like: 

```sh
 $ j offer grafana
ERROR endpoints must conform to format "<application-name>:<endpoint-name>[,...]"
```

unless, it's coming from a bundle overlay, such as:

```yaml
description: Another overlay to create an offer
applications:
 grafana:
 offers:
 dashboards:
 endpoints:
 - dashboards

```

Pylibjuju already has the necessary mechanism that passes along the application name and offer name etc from a bundle/overlay ([here](https://github.com/juju/python-libjuju/blob/ad62156b3bd18c949cd7f65a6b528cbaf023e121/juju/bundle.py#L1041)), this PR is a small change that adjusts the `controller.create_offer` (that actually calls the `ApplicationOffersFacade.Offer`) to not parse the endpoint to get the `offer_name` and `application_name` (that the function parameters are overriding anyways).

Fixes #816 

#### QA Steps

#817 already adds a test that demonstrates the error, this PR extends that to also check for the offer in the model. So the following should pass:

```
tox -e integration -- tests/integration/test_model.py::test_deploy_bundle_with_multiple_overlays_with_include_files
```

Author: jujubot

juju/bundle.py

@@ -1043,7 +1043,7 @@ async def run(self, context):
     def __str__(self):
         endpoints = ""
         if self.endpoints is not None:
-            endpoints = ":{}".format(self.endpoints.join(","))
+            endpoints = ":{}".format(",".join(self.endpoints))
         return "create offer {offer_name} using {application}{endpoints}".format(offer_name=self.offer_name,
                                                                                  application=self.application,
                                                                                  endpoints=endpoints)

juju/controller.py

@@ -728,24 +728,32 @@ async def create_offer(self, model_uuid, endpoint, offer_name=None, application_
         consumers.
 
         @param endpoint: holds the application and endpoint you want to offer
-        @param offer_name: over ride the offer name to help the consumer
+        @param offer_name: override the offer name to help the consumer
+        @param application_name: overrides the application name in the endpoint
         """
-        try:
-            offer = parse_offer_endpoint(endpoint)
-        except OfferParseError as e:
-            log.error(e.message)
-            raise
 
-        if offer_name is None:
-            offer_name = offer.application
+        # If we have both the offer_name and the application_name
+        # then we're coming from bundle/overlays, so no need to parse the endpoint
+        # Also we accept endpoints without a colon (:) in the overlays
+        if offer_name and application_name:
+            o_name = offer_name
+            a_name = application_name
+            eps = {endpoint: endpoint}
+        else:
+            try:
+                offer = parse_offer_endpoint(endpoint)
+            except OfferParseError as e:
+                log.error(e.message)
+                raise
 
-        if application_name is None:
-            application_name = offer.application
+            o_name = offer_name if offer_name else offer.application
+            a_name = application_name if application_name else offer.application
+            eps = {name: name for name in offer.endpoints}
 
         params = client.AddApplicationOffer()
-        params.application_name = application_name
-        params.endpoints = {name: name for name in offer.endpoints}
-        params.offer_name = offer_name
+        params.application_name = a_name
+        params.endpoints = eps
+        params.offer_name = o_name
         params.model_tag = tag.model(model_uuid)
 
         facade = client.ApplicationOffersFacade.from_connection(self.connection())

juju/remoteapplication.py

@@ -44,3 +44,11 @@ class ApplicationOffer(model.ModelEntity):
     @property
     def tag(self):
         return tag.application(self.name)
+
+    @property
+    def offer_name(self):
+        return self.safe_data['offer-name']
+
+    @property
+    def application_name(self):
+        return self.safe_data['application-name']

tests/integration/bundle/test-overlays/test-overlay4.yaml

@@ -0,0 +1,7 @@
+description: Another overlay to create an offer
+applications:
+  grafana:
+    offers:
+      dashboards:
+        endpoints:
+          - dashboards

tests/integration/test_model.py

@@ -321,13 +321,17 @@ async def test_deploy_bundle_with_multiple_overlays_with_include_files(event_loo
         bundle_yaml_path = TESTS_DIR / 'integration' / 'bundle' / 'bundle.yaml'
         overlay1_path = OVERLAYS_DIR / 'test-overlay2.yaml'
         overlay2_path = OVERLAYS_DIR / 'test-overlay3.yaml'
+        overlay3_path = OVERLAYS_DIR / 'test-overlay4.yaml'
 
-        await model.deploy(str(bundle_yaml_path), overlays=[overlay1_path, overlay2_path])
+        await model.deploy(str(bundle_yaml_path), overlays=[overlay1_path, overlay2_path, overlay3_path])
 
         assert 'influxdb' not in model.applications
         assert 'test' not in model.applications
         assert 'memcached' not in model.applications
         assert 'grafana' in model.applications
+        assert 'grafana' in model.application_offers
+        assert 'grafana' == model.application_offers['grafana'].application_name
+        assert 'dashboards' == model.application_offers['grafana'].offer_name
 
 
 @base.bootstrapped