Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/hpc/models.py b/planetstack/hpc/models.py
index 1b80cc6..2980ce7 100644
--- a/planetstack/hpc/models.py
+++ b/planetstack/hpc/models.py
@@ -28,6 +28,10 @@
class Meta:
app_label = "hpc"
+ # legacy vicci content providers already have names.
+ CP_TO_ACCOUNT = {"ON.LAB": "onlabcp",
+ "Syndicate": "syndicatecp"}
+
content_provider_id = models.IntegerField(null=True, blank=True)
name = models.CharField(max_length=254)
enabled = models.BooleanField(default=True)
@@ -39,6 +43,10 @@
def __unicode__(self): return u'%s' % (self.name)
+ @property
+ def account(self):
+ return self.CP_TO_ACCOUNT.get(self.name, self.name)
+
class OriginServer(PlCoreBase):
class Meta:
app_label = "hpc"