From: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Date: Tue, 29 Nov 2016 15:09:30 +0000 (-0500)
Subject: Merge pull request #23 from petevg/bug/instance-placement-bug
X-Git-Tag: 0.1.0~29
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8ffeaa57dd88940c1b21028fbee3fc17dae72d5e;hp=-c;p=osm%2FN2VC.git

Merge pull request #23 from petevg/bug/instance-placement-bug

Added Placement parser.
---

8ffeaa57dd88940c1b21028fbee3fc17dae72d5e
diff --combined juju/application.py
index 5a30235,df309b3..83c2275
--- a/juju/application.py
+++ b/juju/application.py
@@@ -3,6 -3,7 +3,7 @@@ import loggin
  
  from . import model
  from .client import client
+ from .placement import parse as parse_placement
  
  log = logging.getLogger(__name__)
  
@@@ -49,10 -50,6 +50,10 @@@ class Application(model.ModelEntity)
          """
          return self.data['status']['message']
  
 +    @property
 +    def tag(self):
 +        return 'application-%s' % self.name
 +
      async def add_relation(self, local_relation, remote_relation):
          """Add a relation to another application.
  
@@@ -87,7 -84,7 +88,7 @@@
  
          result = await app_facade.AddUnits(
              application=self.name,
-             placement=to,
+             placement=[parse_placement(to)],
              num_units=count,
          )
  
@@@ -341,6 -338,3 +342,6 @@@
  
          """
          pass
 +
 +    async def get_metrics(self):
 +        return await self.model.get_metrics(self.tag)