Modify code of delete resources

[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 a15a7df..9f7773b 100644 (file)
--- a/lcm/lcm/pub/database/models.py
+++ b/lcm/lcm/pub/database/models.py
@@ -113,6 +113,7 @@ class StorageInstModel(models.Model):
     tenant = models.CharField(db_column='TENANT', max_length=50, null=True)
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
     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:
@@ -135,6 +136,7 @@ class VmInstModel(models.Model):
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
     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:
@@ -143,8 +145,9 @@ class VNFCInstModel(models.Model):
     vnfcinstanceid = models.CharField(db_column='VNFCINSTANCEID', max_length=255, primary_key=True)
     vduid = models.CharField(db_column='VDUID', max_length=255)
     vdutype = models.CharField(db_column='VDUTYPE', max_length=255)
-    nfinstid = models.CharField(db_column='NFINSTID', max_length=255)
+    instid = models.CharField(db_column='NFINSTID', max_length=255)
     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:
@@ -155,12 +158,12 @@ class FlavourInstModel(models.Model):
     resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
     name = models.CharField(db_column='NAME', max_length=255)
     tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
-    vcpu = models.IntegerField(db_column='VCPU')
-    memory = models.IntegerField(db_column='MEMORY')
-    disk = models.IntegerField(db_column='DISK')
-    ephemeral = models.IntegerField(db_column='EPHEMERAL')
-    swap = models.IntegerField(db_column='SWAP')
-    isPublic = models.IntegerField(db_column='ISPUBLIC')
+    vcpu = models.IntegerField(db_column='VCPU', null=True)
+    memory = models.IntegerField(db_column='MEMORY', null=True)
+    disk = models.IntegerField(db_column='DISK', null=True)
+    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)
     instid = models.CharField(db_column='INSTID', max_length=255)
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
@@ -190,6 +193,7 @@ class NetworkInstModel(models.Model):
     is_shared = models.IntegerField(db_column='ISSHARED', default=0, null=True)
     vlantrans = models.IntegerField(db_column='VLANTRANS', null=True)
     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:
@@ -259,6 +263,7 @@ class PortInstModel(models.Model):
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
     securityGroups = models.CharField(db_column='SECURITYGROUPS', max_length=255)
     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:
@@ -273,4 +278,37 @@ class CPInstModel(models.Model):
     relatedtype = models.IntegerField(db_column='RELATEDTYPE')
     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)
\ No newline at end of file
+    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