From 6f575c867d4f4fe4b9e294f4a1bcfaa1525005c0 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 18 Apr 2014 15:41:08 -0400 Subject: [PATCH] cleanup unused fields --- planetstack/core/models/site.py | 1 - planetstack/core/models/slice.py | 5 ----- planetstack/core/models/user.py | 2 -- 3 files changed, 8 deletions(-) diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py index 4256e75..e675afb 100644 --- a/planetstack/core/models/site.py +++ b/planetstack/core/models/site.py @@ -10,7 +10,6 @@ class Site(PlCoreBase): """ A logical grouping of Nodes that are co-located at the same geographic location, which also typically corresponds to the Nodes' location in the physical network. """ - tenant_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone tenant id") name = models.CharField(max_length=200, help_text="Name for this Site") site_url = models.URLField(null=True, blank=True, max_length=512, help_text="Site's Home URL Page") enabled = models.BooleanField(default=True, help_text="Status for this Site") diff --git a/planetstack/core/models/slice.py b/planetstack/core/models/slice.py index d031766..f53d7d9 100644 --- a/planetstack/core/models/slice.py +++ b/planetstack/core/models/slice.py @@ -14,16 +14,12 @@ from core.models import Deployment # Create your models here. class Slice(PlCoreBase): - tenant_id = models.CharField(max_length=200, help_text="Keystone tenant id") name = models.CharField(unique=True, help_text="The Name of the Slice", max_length=80) enabled = models.BooleanField(default=True, help_text="Status for this Slice") omf_friendly = models.BooleanField() description=models.TextField(blank=True,help_text="High level description of the slice and expected activities", max_length=1024) slice_url = models.URLField(blank=True, max_length=512) site = models.ForeignKey(Site, related_name='slices', help_text="The Site this Slice belongs to") - network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network") - router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id") - subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id") imagePreference = models.CharField(default="abc",null=True, blank=True, max_length=256) service = models.ForeignKey(Service, related_name='service', null=True, blank=True) @@ -97,7 +93,6 @@ class SliceDeployments(PlCoreBase): network_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum network") router_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum router id") subnet_id = models.CharField(null=True, blank=True, max_length=256, help_text="Quantum subnet id") - keyname = models.CharField(null=True, blank=True, max_length=256, help_text="Nova keypair name") def __unicode__(self): return u'%s %s' % (self.slice, self.deployment) diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py index 9d0c2ec..c4e06e0 100644 --- a/planetstack/core/models/user.py +++ b/planetstack/core/models/user.py @@ -58,8 +58,6 @@ class User(AbstractBaseUser): username = models.CharField(max_length=255, default="Something" ) - - kuser_id = models.CharField(null=True, blank=True, help_text="keystone user id", max_length=200) firstname = models.CharField(help_text="person's given name", max_length=200) lastname = models.CharField(help_text="person's surname", max_length=200) -- 2.43.0