X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=826ba7484b6f5618718f821bdeaa232e33a42dbf;hb=37feb131a0d7dc25522ff52150d215ac284dd4bd;hp=de6dc8df58f6dc3421cc43435c69f41d6d3b995c;hpb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py index de6dc8df..826ba748 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,22 @@ 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) + nodeId = models.CharField(db_column='NODEID', max_length=255, null=True) class VNFCInstModel(models.Model): class Meta: @@ -139,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: @@ -151,13 +158,13 @@ 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') - extraspecs = models.CharField(db_column='EXTRASPECS', max_length=255) + 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.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) @@ -186,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: @@ -255,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: @@ -269,4 +278,4 @@ 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)