X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=3f10d6f2f6b54b3ee5c030647846bf7e91f1e0db;hb=97f8569b9781e705851f65c51eb7b85242a9037d;hp=85c58d24d91aff7c37f52b572d415ccfc856c8a7;hpb=b6c58ae677f7a0ba3ec8bca99d6a88f4326e2065;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py
index 85c58d24..3f10d6f2 100644
--- 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:
@@ -120,17 +121,21 @@ class VmInstModel(models.Model):
 
     vmid = models.CharField(db_column='VMID', primary_key=True, max_length=255)
     vimid = models.CharField(db_column='VIMID', max_length=255)
+    tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
     resouceid = models.CharField(db_column='RESOURCEID', max_length=255)
-    insttype = models.IntegerField(db_column='INSTTYPE')
-    instid = models.CharField(db_column='INSTID', max_length=255)
     vmname = models.CharField(db_column='VMNAME', max_length=255)
-    operationalstate = models.IntegerField(db_column='OPERATIONALSTATE', null=True)
-    zoneid = models.CharField(db_column='ZONEID', max_length=255, null=True)
-    tenant = models.CharField(db_column='TENANT', max_length=255, null=True)
-    hostid = models.CharField(db_column='HOSTID', max_length=255, null=True)
-    detailinfo = models.TextField(db_column='DETAILINFO', max_length=8192, null=True)
+    nic_array = models.CharField(db_column='NICARRAY', max_length=255)
+    metadata = models.CharField(db_column='METADATA', max_length=255)
+    volume_array = models.CharField(db_column='VOLUMEARRAY', max_length=255)
+    server_group = models.CharField(db_column='SERVERGROUP', max_length=255)
+    availability_zone = models.CharField(db_column='AVAILABILITYZONE', max_length=255)
+    flavor_id = models.CharField(db_column='FLAVORID', max_length=255)
+    security_groups = models.CharField(db_column='SECURITYGROUPS', max_length=255)
+    operationalstate = models.CharField(db_column='OPERATIONALSTATE', max_length=255, null=True)
+    insttype = models.IntegerField(db_column='INSTTYPE')
     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)
 
 class VNFCInstModel(models.Model):
     class Meta:
@@ -147,14 +152,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)
-    vmid = models.CharField(db_column='VMID', 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:
@@ -180,7 +191,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:
@@ -202,6 +213,9 @@ class SubNetworkInstModel(models.Model):
     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:
@@ -245,6 +259,9 @@ class PortInstModel(models.Model):
     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)
+    nodeId = models.CharField(db_column='NODEID', max_length=255, null=True)
 
 class CPInstModel(models.Model):
     class Meta: