X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2Fjuju%2Fplacement.py;fp=modules%2Flibjuju%2Fjuju%2Fplacement.py;h=0000000000000000000000000000000000000000;hp=d0d42f7520e1c663cbfe76c53ecf8a5fc2ae0a2b;hb=9d18c22a0dc9e295adda50601fc5e2f45d2c9b8a;hpb=19c5cfca317615597be6bf1051e9d2fa903adb97

diff --git a/modules/libjuju/juju/placement.py b/modules/libjuju/juju/placement.py
deleted file mode 100644
index d0d42f7..0000000
--- a/modules/libjuju/juju/placement.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# This module allows us to parse a machine placement directive into a
-# Placement object suitable for passing through the websocket API.
-#
-# Once https://bugs.launchpad.net/juju/+bug/1645480 is addressed, this
-# module should be deprecated.
-#
-
-from .client import client
-
-MACHINE_SCOPE = "#"
-
-
-def parse(directive):
-    """
-    Given a string in the format `scope:directive`, or simply `scope`
-    or `directive`, return a Placement object suitable for passing
-    back over the websocket API.
-
-    """
-    if not directive:
-        # Handle null case
-        return None
-
-    if isinstance(directive, (list, tuple)):
-        results = []
-        for d in directive:
-            results.extend(parse(d))
-        return results
-
-    if isinstance(directive, (dict, client.Placement)):
-        # We've been handed something that we can simply hand back to
-        # the api. (Forwards compatibility)
-        return [directive]
-
-    # Juju 2.0 can't handle lxc containers.
-    directive = directive.replace('lxc', 'lxd')
-
-    if ":" in directive:
-        # Planner has given us a scope and directive in string form
-        scope, directive = directive.split(":")
-        return [client.Placement(scope=scope, directive=directive)]
-
-    if directive.isdigit():
-        # Planner has given us a machine id (we rely on juju core to
-        # verify its validity.)
-        return [client.Placement(scope=MACHINE_SCOPE, directive=directive)]
-
-    if "/" in directive:
-        # e.g. "0/lxd/0"
-        # https://github.com/juju/juju/blob/master/instance/placement_test.go#L29
-        return [
-            client.Placement(scope=MACHINE_SCOPE, directive=directive),
-        ]
-
-    # Planner has probably given us a container type. Leave it up to
-    # juju core to verify that it is valid.
-    return [client.Placement(scope=directive)]