Merge juju-bmc:juju-bmc-strict into juju-bmc:master

[Jose Guedez]

add support for strict snap confinement

Add support for strict snap confinement

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Jose Guedez (jfguedez)]

replied to comment inline

[Joe Guo (guoqiao)]

LGTM, +1.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 6ddecd86f6b22d2ab31cf7a30507a6789cd27471

diff --git a/juju-bmc/__init__.py b/juju-bmc/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/juju-bmc/__init__.py
diff --git a/src/juju-bmc b/juju-bmc/juju-bmc
similarity index 85%
rename from src/juju-bmc
rename to juju-bmc/juju-bmc
index 5194ff4..70a1953 100755
--- a/src/juju-bmc
+++ b/juju-bmc/juju-bmc
@@ -35,6 +35,9 @@ import logging
 import os
 import subprocess
 
+from juju.model import Model
+from juju import loop
+
 # `__name__` will show `__main__`
 LOG = logging.getLogger('juju-bmc')
 
@@ -72,6 +75,23 @@ def parse_args():
     return parser.parse_args()
 
 
+async def get_machine_instance_id(machine_id):
+    """
+    Connects to the juju controller using default credentials in $HOME
+    to obtain the instance id of the provided machine_id
+    """
+    # connect to the current juju controller/model
+    model = Model()
+    await model.connect()
+
+    machine = model.machines.get(machine_id)
+    if not machine:
+        LOG.error('juju machine %s not found, exit', machine_id)
+        sys.exit(-1)
+
+    return machine.data["instance-id"]
+
+
 def main():
     args = parse_args()
 
@@ -86,13 +106,7 @@ def main():
 
     # machine_id --> instance_id/system_id
     machine_id = str(args.machine_id)
-    cmd = ['juju', 'show-machine', machine_id, '--format', 'json']
-    data = json.loads(get_cmd_output(cmd))
-    machines = data['machines']
-    if not machines:
-        LOG.error('juju machine %s not found, exit', machine_id)
-        sys.exit(-1)
-    instance_id = machines[str(machine_id)]['instance-id']
+    instance_id = loop.run(get_machine_instance_id(machine_id))
     LOG.info('find juju instance-id(maas system_id) for machine %s: %s', machine_id, instance_id)
 
     # find maas api name
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..3dd7f92
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+from setuptools import setup, find_packages
+
+setup(
+    name='juju-bmc',
+    version='0.11',
+    url='https://launchpad.net/juju-bmc',
+    author='Canonical Bootstack',
+    author_email="[e-mail]",
+    description="juju plugin that adds a command to access a server out band management",
+    packages=find_packages(),
+    install_requires=['juju >= 2.8.1'],
+    scripts=[
+        "juju-bmc/juju-bmc",
+    ],
+)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 866e08f..0522094 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -8,21 +8,30 @@ description: |
   and establishes a connection to the BMC console of a bare metal server.
 
 grade: devel # must be 'stable' to release into candidate/stable channels
-confinement: devmode # use 'strict' once you have the right plugs and slots
+confinement: strict
+
+plugs:
+  config-files:
+    interface: personal-files
+    read:
+      - $HOME/.maascli.db
+      - $HOME/.local/share/juju
+    write:
+      - $HOME/.maascli.db
 
 apps:
   juju-bmc:
     command: bin/juju-bmc
+    plugs:
+      - network
+      - config-files
+      - ssh-keys
 
 parts:
   juju-bmc:
-    plugin: dump
-    source: ./src
-    organize:
-      juju-bmc: bin/
+    plugin: python
+    source: ./
     stage-packages:
       - maas-cli
       - ipmitool
       - sshpass
-    stage-snaps:
-      - juju/latest/stable