X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=de6dc8df58f6dc3421cc43435c69f41d6d3b995c;hb=d672544f4b8c9a8b181b0f7feb6cf4ff710e0362;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..de6dc8df 100644 --- a/lcm/lcm/pub/database/models.py +++ b/lcm/lcm/pub/database/models.py @@ -147,14 +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) - 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: @@ -181,7 +187,6 @@ class NetworkInstModel(models.Model): vlantrans = models.IntegerField(db_column='VLANTRANS', null=True) routerExternal = models.IntegerField(db_column='ROUTEREXTERNAL', default=0, null=True) - class SubNetworkInstModel(models.Model): class Meta: db_table = 'SUBNETWORKINST' @@ -202,6 +207,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 +253,8 @@ 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) class CPInstModel(models.Model): class Meta: