Merge bootstack-ops:jjo-juju_bundle_export-juju_12 into bootstack-ops:master

[JuanJo Ciarlante]

[jjo] add juju2 support, verified working ok (juju-deployer --diff w/minimals) on both juju1,2

[jjo] add juju2 support, verified working ok (juju-deployer --diff w/minimals) on both juju1,2

[JuanJo Ciarlante (jjo)]

FYI tested on both juju versions as:
v1:
  ./scripts/juju_bundle_export.py -o env.yaml -o env.codetree
  JUJU_DEPLOYER=~/bootstack-*lab/charms
  juju-deployer --diff -c env.yaml

v2:
  ./scripts/juju_bundle_export.py -o env.yaml -o env.codetree
  JUJU_DEPLOYER=~/charms
  juju-deployer --diff -c env.yaml

[Peter Sabaini (peter-sabaini)]

Lgtm in general, some minor comments inline

review: Approve

[JuanJo Ciarlante (jjo)]

Thanks Peter for the review, will address your comments.

[JuanJo Ciarlante (jjo)]

@chrome0: addressed comments, PTAL

[Peter Sabaini (peter-sabaini)]

Coolbeans, +1

review: Approve

diff --git a/ops-bundle/scripts/juju_bundle_export.py b/ops-bundle/scripts/juju_bundle_export.py
index 1fd6487..8256cdf 100755
--- a/ops-bundle/scripts/juju_bundle_export.py
+++ b/ops-bundle/scripts/juju_bundle_export.py
@@ -24,8 +24,7 @@ import yaml
 import argparse
 import re
 import requests
-from jujuclient import Environment
-from deployer import utils
+from deployer import (utils, env)
 
 logging.basicConfig()
 logger = logging.getLogger()
@@ -38,7 +37,7 @@ CHARM_DIR_MAP = {
 
 
 def charmstore_get(series, charm):
-    cs_reply = requests.get('https://api.jujucharms.com/v4/search', params = {
+    cs_reply = requests.get('https://api.jujucharms.com/v4/search', params={
         'name': charm,
         'series': series,
     })
@@ -52,37 +51,75 @@ def charmstore_get(series, charm):
 class Bundle(object):
     def __init__(self, args):
         self.args = args
+
         self.env_name = utils.get_env_name(args.env_name)
-        self.env = Environment.connect(self.env_name)
+        self.env = env.select_runtime(self.env_name, None)
+        logger.debug('Using runtime %s on %s', env.__class__.__name__, self.env_name)
+        self.env.connect()
         self.env._debug = args.debug
         self.deploy = {}
         self.codetree = {}
 
+    # Below two methods mostly stolen from deployer/action/diff.py,
+    # as juju2 doesn't have a relations dict, need to build it from
+    # each service iteration
+    def _get_rel_name(self, src, tgt):
+        if not self.env_status:
+            logger.warning("_get_rel_name called without initialized env_status")
+            return None
+        svc_rels = self.env_status['services'][tgt]['relations']
+        for r, eps in svc_rels.items():
+            if src in eps:
+                return r
+        return None
+
+    def _load_rels(self, svc_name):
+        rels = set()
+        svc_rels = self.env_status['services'][svc_name].get(
+            'relations', {})
+        # There is ambiguity here for multiple rels between two
+        # services without the relation id, which we need support
+        # from core for.
+        for r_name, r_svcs in svc_rels.items():
+            for r_svc in r_svcs:
+                # Skip peer relations
+                if r_svc == svc_name:
+                    continue
+                rr_name = self._get_rel_name(svc_name, r_svc)
+                rels.add(
+                    tuple(sorted([
+                        "%s:%s" % (svc_name, r_name),
+                        "%s:%s" % (r_svc, rr_name)] if rr_name else r_svc)))
+        return rels
+
     def export(self):
-        stat = self.env.get_stat()
+        self.env_status = self.env.status()
         services = {}
-        relations = []
-        for service_name, service_val in stat.get('Services', {}).items():
-            units = service_val.get('Units', None)
-            subord_to = service_val.get('SubordinateTo')
+        relations = set()
+        subordto_key = [None, 'SubordinateTo', 'subordinate-to'][self.env.juju_version]
+        charm_key = [None, 'Charm', 'charm'][self.env.juju_version]
+        # print( yaml.dump(self.env_status.get('services'), default_flow_style=False))
+        for service_name, service_val in self.env_status.get('services', {}).items():
+            units = service_val.get('units', None)
+            subord_to = service_val.get(subordto_key)
             # Subordinate units show no Units
             if units or subord_to:
-                charm = '-'.join(service_val['Charm'].split('-')[0:-1])
+                charm = '-'.join(service_val[charm_key].split('-')[0:-1])
                 service = {
                     'charm': charm
                 }
                 if units:
                     service['num_units'] = len(units)
                 if not self.args.minimal:
-                    config = self.env.get_service(service_name).get('Config', {})
+                    config = self.env.get_config(service_name)
                     options = {k: v['value'] for k, v in config.items()
                                if not v.get('default', False)}
                     if options:
                         service['options'] = options
                 services[service_name] = service
-        for relation in stat.get('Relations', []):
-            if len(relation.get('Endpoints')) == 2:
-                relations.append(relation.get('Key').split(' '))
+            relations.update(self._load_rels(service_name))
+        relations = [list(rel) for rel in sorted(relations)]
+
         self.deploy = {
             'services': services,
             'relations': relations,
@@ -94,8 +131,7 @@ class Bundle(object):
         self.local_charm_url_map = {}
         bootstack_dir = self.args.bootstackdir.format(env_name=self.env_name)
         bs_codetree_file = os.path.join(bootstack_dir,
-            "customer/configs/bootstack-charms.bzr")
-        logger.info("foo")
+                                        "customer/configs/bootstack-charms.bzr")
         if (os.path.exists(bs_codetree_file)):
             with open(bs_codetree_file) as bs_ct_f:
                 for line in bs_ct_f:
@@ -112,7 +148,7 @@ class Bundle(object):
 
     def local_charm_dir(self, charm_dir):
         if self.local_charms_dir and os.path.exists(
-            os.path.join(self.local_charms_dir, charm_dir)):
+                os.path.join(self.local_charms_dir, charm_dir)):
             return os.path.join(self.local_charms_dir, charm_dir)
         return None
 
@@ -121,7 +157,7 @@ class Bundle(object):
         for service, service_val in self.deploy['services'].items():
             charm_url = service_val['charm']
             if charm_url.startswith('local:'):
-                service_val['charm'] = self.get_charm_local_url(service, charm_url)     
+                service_val['charm'] = self.get_charm_local_url(service, charm_url)
 
     def get_charm_local_url(self, service, charm_url):
         """Return a line for codetree, in the form of