Modify table module and related code

[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 2337668..d386ae6 100644 (file)
--- a/lcm/lcm/pub/database/models.py
+++ b/lcm/lcm/pub/database/models.py
@@ -19,40 +19,19 @@ class NfInstModel(models.Model):
         db_table = 'NFINST'
 
     nfinstid = models.CharField(db_column='NFINSTID', max_length=200, primary_key=True)
-    mnfinstid = models.CharField(db_column='M_NFINSTID', max_length=200, blank=True, null=True)
     nf_name = models.CharField(db_column='NFNAME', max_length=100, blank=True, null=True) #CreateVnfRequest.vnfInstanceName
-    template_id = models.CharField(db_column='TEMPLATEID', max_length=200, blank=True, null=True)
-    vnf_id = models.CharField(db_column='VNFID', max_length=200, blank=True, null=True)
     package_id = models.CharField(db_column='PACKAGEID', max_length=200, blank=True, null=True)
-    vnfm_inst_id = models.CharField(db_column='VNFMINSTID', max_length=200, blank=True, null=True)
-    multivim = models.IntegerField(db_column='MULTIVIM', default=0)
-    ns_inst_id = models.CharField(db_column='NSINSTID', max_length=200, blank=True, null=True)
     status = models.CharField(db_column='STATUS', max_length=20, blank=True, null=True)
     flavour_id = models.CharField(db_column='FLAVOURID', max_length=200, blank=True, null=True) #InstantiateVnfRequest.flavourId
-    vnf_level = models.CharField(db_column='VNFLEVEL', max_length=200, blank=True, null=True) #InstantiateVnfRequest.instantiationLevelId
     location = models.CharField(db_column='LOCATION', max_length=200, blank=True, null=True)
-    deploy_environment = models.CharField(db_column='DEPLOYENVIRONMENT', max_length=100, blank=True, null=True)
-    max_vm = models.IntegerField(db_column='MAXVM', blank=True, null=True)
-    max_cpu = models.IntegerField(db_column='MAXCPU', blank=True, null=True)
-    max_ram = models.IntegerField(db_column='MAXRAM', blank=True, null=True)
-    max_hd = models.IntegerField(db_column='MAXHD', blank=True, null=True)
-    max_shd = models.IntegerField(db_column='MAXSHD', blank=True, null=True)
-    max_net = models.IntegerField(db_column='MAXNET', blank=True, null=True)
     version = models.CharField(db_column='VERSION', max_length=255, null=True)
     vendor = models.CharField(db_column='VENDOR', max_length=255, null=True, blank=True)
-    producttype = models.CharField(db_column='PRODUCTTYPE', max_length=255, null=True)
     netype = models.CharField(db_column='NETYPE', max_length=255, null=True)
     vnfd_model = models.TextField(db_column='VNFDMODEL', max_length=20000, blank=True, null=True)
     input_params = models.TextField(db_column='INPUTPARAMS', max_length=2000, blank=True, null=True)  #InstantiateVnfRequest.additionalParams
-    scale_params = models.TextField(db_column='SCALEPARAMS', max_length=2000, null=True, blank=True)
     create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
     lastuptime = models.CharField(db_column='LASTUPTIME', max_length=200, blank=True, null=True)
-    extension = models.TextField(db_column='EXTENSION', max_length=65535, blank=True, null=True)
-    initallocatedata = models.TextField(db_column='INITALLOCATEDATA', max_length=20000, blank=True, null=True)
-    predefinedvm = models.TextField(db_column='PREDEFINEDVM', max_length=65535, blank=True, null=True)
-    vnfextendtype = models.CharField(db_column='VNFEXTENDTYPE', max_length=255, null=True)
 
-    instantiationState = models.CharField(db_column='INSTANTIATIONSTATE', max_length=200, blank=True, null=True)
     nf_desc = models.CharField(db_column='VNFINSTANCEDESC', max_length=200, blank=True, null=True)
     vnfdid = models.CharField(db_column='VNFDID', max_length=200, blank=True, null=True)
     vnfSoftwareVersion = models.CharField(db_column='VNFSOFTWAREVER', max_length=200, blank=True, null=True)
@@ -113,6 +92,27 @@ 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'
+
+    storageid = models.CharField(db_column='STORAGEID', primary_key=True, max_length=255)
+    vimid = models.CharField(db_column='VIMID', max_length=255)
+    resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
+    insttype = models.IntegerField(db_column='INSTTYPE')
+    instid = models.CharField(db_column='INSTID', max_length=255)
+    name = models.CharField(db_column='NAME', max_length=255, null=True)
+    storagetype = models.CharField(db_column='STORAGETYPE', max_length=255)
+    size = models.CharField(db_column='SIZE', max_length=255)
+    rdmaenabled = models.IntegerField(db_column='RDMAENABLED', null=True)
+    disktype = models.CharField(db_column='DISKTYPE', max_length=255)
+    ownerid = models.CharField(db_column='OWNERID', max_length=255, null=True)
+    zoneid = models.CharField(db_column='ZONEID', max_length=255, null=True)
+    hostid = models.CharField(db_column='HOSTID', max_length=255, null=True)
+    operationalstate = models.CharField(db_column='OPERATIONALSTATE', max_length=255, null=True)
+    tenant = models.CharField(db_column='TENANT', max_length=50, null=True)
+    is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
+
 class VmInstModel(models.Model):
     class Meta:
         db_table = 'VMINST'
@@ -140,6 +140,18 @@ class VNFCInstModel(models.Model):
     nfinstid = models.CharField(db_column='NFINSTID', max_length=255)
     vmid = models.CharField(db_column='VMID', max_length=255)
 
+class FlavourInstModel(models.Model):
+    class Meta:
+        db_table = 'FLAVOURINST'
+
+    flavourid = models.CharField(db_column='FLAVOURID', max_length=255, primary_key=True)
+    name = models.CharField(db_column='NAME', max_length=255)
+    vcpu = models.CharField(db_column='VCPU', max_length=255)
+    memory = models.CharField(db_column='MEMORY', max_length=255)
+    extraspecs = models.CharField(db_column='EXTRASPECS', max_length=255)
+    instid = models.CharField(db_column='INSTID', max_length=255)
+    is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
+
 class NetworkInstModel(models.Model):
     class Meta:
         db_table = 'NETWORKINST'
@@ -224,6 +236,7 @@ class PortInstModel(models.Model):
     tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
     interfacename = models.CharField(db_column='INTERFACENAME', max_length=255, blank=True, null=True)
     vmid = models.CharField(db_column='VMID', max_length=255, blank=True, null=True)
+    is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
 
 class CPInstModel(models.Model):
     class Meta: