X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=de6dc8df58f6dc3421cc43435c69f41d6d3b995c;hb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;hp=3c45ff5b49574da2c5d5becf1d3589504229f468;hpb=794bf69b7fd14671e80b1caebaf807e1b5f85073;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py
index 3c45ff5b..de6dc8df 100644
--- a/lcm/lcm/pub/database/models.py
+++ b/lcm/lcm/pub/database/models.py
@@ -104,14 +104,15 @@ class StorageInstModel(models.Model):
     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)
+    # 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)
+    create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
 
 class VmInstModel(models.Model):
     class Meta:
@@ -129,6 +130,7 @@ class VmInstModel(models.Model):
     hostid = models.CharField(db_column='HOSTID', max_length=255, null=True)
     detailinfo = models.TextField(db_column='DETAILINFO', max_length=8192, 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)
 
 class VNFCInstModel(models.Model):
     class Meta:
@@ -145,12 +147,20 @@ class FlavourInstModel(models.Model):
         db_table = 'FLAVOURINST'
 
     flavourid = models.CharField(db_column='FLAVOURID', max_length=255, primary_key=True)
+    vimid = models.CharField(db_column='VIMID', max_length=255)
+    resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
     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)
+    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')
     extraspecs = models.CharField(db_column='EXTRASPECS', max_length=255)
     instid = models.CharField(db_column='INSTID', max_length=255)
-    tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
+    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:
@@ -163,7 +173,6 @@ class NetworkInstModel(models.Model):
     instid = models.CharField(db_column='INSTID', max_length=255)
     name = models.CharField(db_column='NAME', max_length=255)
     tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
-    is_shared = models.IntegerField(db_column='ISSHARED', default=0, null=True)
     is_predefined = models.IntegerField(db_column='ISPREDEFINED', default=0, null=True)
     desc = models.CharField(db_column='DESC', max_length=255, null=True)
     vendor = models.CharField(db_column='VENDOR', max_length=255, null=True)
@@ -171,9 +180,12 @@ class NetworkInstModel(models.Model):
     mtu = models.IntegerField(db_column='MTU', null=True)
     network_type = models.CharField(db_column='NETWORKTYPE', max_length=255, null=True)
     segmentid = models.CharField(db_column='SEGMENTID', max_length=255, null=True)
-    vlantrans = models.IntegerField(db_column='VLANTRANS', null=True)
     networkqos = models.CharField(db_column='NETWORKQOS', max_length=255, null=True)
-
+    create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True)
+    physicalNetwork = models.CharField(db_column='PHYNETWORK', max_length=255, null=True)
+    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)
 
 class SubNetworkInstModel(models.Model):
     class Meta:
@@ -194,6 +206,10 @@ class SubNetworkInstModel(models.Model):
     operationalstate = models.CharField(db_column='OPERATIONALSTATE', max_length=255, null=True)
     tenant = models.CharField(db_column='TENANT', max_length=255, 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)
+    dnsNameservers = models.TextField(db_column='DNSNAMESERVERS', max_length=1024)
+    hostRoutes = models.TextField(db_column='HOSTROUTES', max_length=1024)
+    allocationPools = models.TextField(db_column='ALLOCATIONPOOLS', max_length=1024)
 
 class VLInstModel(models.Model):
     class Meta:
@@ -236,6 +252,9 @@ 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)
+    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)
 
 class CPInstModel(models.Model):
     class Meta: