Modify vnflcm code according to PEP8 standard

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / database / models.py

diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py
index 9f7773b..02993e7 100644 (file)
--- a/lcm/lcm/pub/database/models.py
+++ b/lcm/lcm/pub/database/models.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from django.db import models
 
 
@@ -38,6 +39,7 @@ class NfInstModel(models.Model):
     vnfConfigurableProperties = models.TextField(db_column='VNFCONFIGURABLEPROPERTIES', max_length=20000, blank=True, null=True)
     localizationLanguage = models.CharField(db_column='LOCALIZATIONLANGUAGE', max_length=255, null=True)
 
+
 class JobModel(models.Model):
     class Meta:
         db_table = 'JOB'
@@ -60,6 +62,7 @@ class JobModel(models.Model):
         import json
         return json.dumps(dict([(attr, getattr(self, attr)) for attr in [f.name for f in self._meta.fields]]))
 
+
 class JobStatusModel(models.Model):
     class Meta:
         db_table = 'JOB_STATUS'
@@ -78,6 +81,7 @@ class JobStatusModel(models.Model):
         import json
         return json.dumps(dict([(attr, getattr(self, attr)) for attr in [f.name for f in self._meta.fields]]))
 
+
 class NfvoRegInfoModel(models.Model):
     class Meta:
         db_table = 'NFVOREGINFO'
@@ -92,6 +96,7 @@ class NfvoRegInfoModel(models.Model):
     servercert = models.CharField(max_length=255, db_column='SERVERCERT', null=True)
     regtime = models.CharField(max_length=255, db_column='REGTIME')
 
+
 class StorageInstModel(models.Model):
     class Meta:
         db_table = 'STORAGEINST'
@@ -115,6 +120,7 @@ class StorageInstModel(models.Model):
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
     nodeId = models.CharField(db_column='NODEID', max_length=255, null=True)
 
+
 class VmInstModel(models.Model):
     class Meta:
         db_table = 'VMINST'
@@ -138,6 +144,7 @@ class VmInstModel(models.Model):
     instid = models.CharField(db_column='INSTID', max_length=255)
     nodeId = models.CharField(db_column='NODEID', max_length=255, null=True)
 
+
 class VNFCInstModel(models.Model):
     class Meta:
         db_table = 'VNFCINST'
@@ -149,6 +156,7 @@ class VNFCInstModel(models.Model):
     vmid = models.CharField(db_column='VMID', max_length=255)
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
 
+
 class FlavourInstModel(models.Model):
     class Meta:
         db_table = 'FLAVOURINST'
@@ -164,11 +172,12 @@ class FlavourInstModel(models.Model):
     ephemeral = models.IntegerField(db_column='EPHEMERAL', null=True)
     swap = models.IntegerField(db_column='SWAP', null=True)
     isPublic = models.IntegerField(db_column='ISPUBLIC', null=True)
-    extraspecs = models.CharField(db_column='EXTRASPECS', max_length=255)
+    extraspecs = models.TextField(db_column='EXTRASPECS', max_length=4096)
     instid = models.CharField(db_column='INSTID', max_length=255)
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
 
+
 class NetworkInstModel(models.Model):
     class Meta:
         db_table = 'NETWORKINST'
@@ -195,6 +204,7 @@ class NetworkInstModel(models.Model):
     routerExternal = models.IntegerField(db_column='ROUTEREXTERNAL', default=0, null=True)
     nodeId = models.CharField(db_column='NODEID', max_length=255, null=True)
 
+
 class SubNetworkInstModel(models.Model):
     class Meta:
         db_table = 'SUBNETWORKINST'
@@ -219,6 +229,7 @@ class SubNetworkInstModel(models.Model):
     hostRoutes = models.TextField(db_column='HOSTROUTES', max_length=1024)
     allocationPools = models.TextField(db_column='ALLOCATIONPOOLS', max_length=1024)
 
+
 class VLInstModel(models.Model):
     class Meta:
         db_table = 'VLINST'
@@ -234,6 +245,7 @@ class VLInstModel(models.Model):
     vimid = models.CharField(db_column='VIMID', max_length=255)
     tenant = models.CharField(db_column='TENANT', max_length=50)
 
+
 class PortInstModel(models.Model):
     class Meta:
         db_table = 'PORTINST'
@@ -265,6 +277,7 @@ class PortInstModel(models.Model):
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
     nodeId = models.CharField(db_column='NODEID', max_length=255, null=True)
 
+
 class CPInstModel(models.Model):
     class Meta:
         db_table = 'CPINST'
@@ -279,36 +292,3 @@ class CPInstModel(models.Model):
     relatedvl = models.CharField(db_column='RELATEDVL', max_length=255, blank=True, null=True)
     relatedcp = models.CharField(db_column='RELATEDCP', max_length=255, blank=True, null=True)
     relatedport = models.CharField(db_column='RELATEDPORT', max_length=255, blank=True, null=True)
-
-class VimModel(models.Model):
-    vimid = models.IntegerField(db_column='CMSERVERID', primary_key=True)
-    name = models.CharField(db_column='NAME', max_length=255, blank=True, null=True)
-    type = models.CharField(db_column='CMSTYPE', max_length=255, blank=True, null=True)
-    imageurl = models.CharField(db_column='IMAGEURL', max_length=1024, blank=True, null=True)
-    apiurl = models.CharField(db_column='APIURL', max_length=1024, blank=True, null=True)
-    version = models.CharField(db_column='VER', max_length=1024, blank=True, null=True)
-    supportnotification = models.IntegerField(db_column='SUPPORTNOTIFICATION', default=0)
-    longitude = models.CharField(db_column='LONGITUDE', max_length=1024, blank=True, null=True)
-    latitude = models.CharField(db_column='LATITUDE', max_length=1024, blank=True, null=True)
-    grantexclude = models.CharField(db_column='GRANTEXCLUDE', max_length=1, default='0', blank=True, null=True)
-    slalevel = models.IntegerField(db_column='SLALEVEL', default=0)
-
-    class Meta:
-        db_table = 'CMSSERVER'
-
-    def __unicode__(self):
-        return '%s' % self.name
-
-
-class VimUserModel(models.Model):
-    class Meta:
-        db_table = 'CMSSERVER_USER'
-
-    uuid = models.CharField(db_column='UUID', primary_key=True, max_length=255)
-    vimid = models.IntegerField(db_column='CMSERVERID')
-    username = models.CharField(db_column='USERNAME', max_length=255)
-    password = models.CharField(db_column='PWD', max_length=255, blank=True)
-    defaulttenant = models.CharField(db_column='TENANT', max_length=255, blank=True)
-
-    def __unicode__(self):
-        return '%s' % self.username
\ No newline at end of file