X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=c2e00712cfe85483ee38e4fd82801b6698a206bd;hb=496bca378a06a8690d23b999b713900347ac96f2;hp=4f4fc9f288f857d260263646ce98fa40ef86de9e;hpb=8f75d6276d4f1a8c5e9da1c77f2def362db11596;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py index 4f4fc9f2..c2e00712 100644 --- a/lcm/lcm/pub/database/models.py +++ b/lcm/lcm/pub/database/models.py @@ -39,6 +39,9 @@ class NfInstModel(models.Model): vnfSoftwareVersion = models.CharField(db_column='VNFSOFTWAREVER', max_length=200, blank=True, null=True) vnfConfigurableProperties = models.TextField(db_column='VNFCONFIGURABLEPROPERTIES', max_length=20000, blank=True, null=True) localizationLanguage = models.CharField(db_column='LOCALIZATIONLANGUAGE', max_length=255, null=True) + operationState = models.CharField(db_column='OPERATIONSTATE', max_length=255, null=True) + resInfo = models.TextField(db_column='RESINFO', max_length=20000, blank=True, null=True) + vimInfo = models.TextField(db_column='VIMINFO', max_length=20000, blank=True, null=True) class JobModel(models.Model): @@ -104,7 +107,7 @@ class StorageInstModel(models.Model): 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) + resourceid = 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) @@ -129,7 +132,7 @@ 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) + resourceid = models.CharField(db_column='RESOURCEID', max_length=255) vmname = models.CharField(db_column='VMNAME', max_length=255) nic_array = models.CharField(db_column='NICARRAY', max_length=255) metadata = models.CharField(db_column='METADATA', max_length=255) @@ -164,7 +167,7 @@ class FlavourInstModel(models.Model): 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) + resourceid = 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', null=True) @@ -185,7 +188,7 @@ class NetworkInstModel(models.Model): networkid = models.CharField(db_column='NETWORKID', primary_key=True, max_length=255) vimid = models.CharField(db_column='VIMID', max_length=255) - resouceid = models.CharField(db_column='RESOURCEID', max_length=255) + resourceid = 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) @@ -212,7 +215,7 @@ class SubNetworkInstModel(models.Model): subnetworkid = models.CharField(db_column='SUBNETWORKID', primary_key=True, max_length=255) vimid = models.CharField(db_column='VIMID', max_length=255) - resouceid = models.CharField(db_column='RESOURCEID', max_length=255) + resourceid = models.CharField(db_column='RESOURCEID', max_length=255) networkid = models.CharField(db_column='NETWORKID', max_length=255) insttype = models.IntegerField(db_column='INSTTYPE') instid = models.CharField(db_column='INSTID', max_length=255) @@ -255,7 +258,7 @@ class PortInstModel(models.Model): networkid = models.CharField(db_column='NETWORKID', max_length=255) subnetworkid = models.CharField(db_column='SUBNETWORKID', max_length=255, null=True) vimid = models.CharField(db_column='VIMID', max_length=255) - resouceid = models.CharField(db_column='RESOURCEID', max_length=255) + resourceid = models.CharField(db_column='RESOURCEID', max_length=255) name = models.CharField(db_column='NAME', max_length=255, null=True) insttype = models.IntegerField(db_column='INSTTYPE') instid = models.CharField(db_column='INSTID', max_length=255) @@ -310,3 +313,26 @@ class SubscriptionModel(models.Model): vnf_instance_filter = models.TextField(db_column='VNFINSTANCEFILTER', null=True) links = models.TextField(db_column='LINKS', max_length=20000) + + +class VNFLcmOpOccModel(models.Model): + class Meta: + db_table = 'VNFLCMOPOCCS' + + id = models.CharField(db_column='ID', max_length=255, primary_key=True) + operation_state = models.CharField(db_column='OPERATIONSTATE', null=False, max_length=30) + state_entered_time = models.CharField(db_column='STATEENTEREDTIME', null=False, max_length=30) + start_time = models.CharField(db_column='STARTTIME', null=False, max_length=30) + vnf_instance_id = models.CharField(db_column='VNFINSTANCEID', null=False, max_length=255) + grant_id = models.CharField(db_column='GRANTID', null=True, max_length=255) + operation = models.CharField(db_column='OPERATION', null=False, max_length=30) + sub_operation = models.CharField(db_column='SUBOPERATION', null=True, max_length=30) + is_automatic_invocation = models.CharField(db_column='ISAUTOMATICINVOCATION', null=False, max_length=5) + operation_params = models.TextField(db_column='OPERATIONPARAMS', null=False) + is_cancel_pending = models.CharField(db_column='ISCANCELPENDING', null=False, max_length=5) + cancel_mode = models.TextField(db_column='CANCELMODE', null=True) + error = models.TextField(db_column='ERROR', null=True) + resource_changes = models.TextField(db_column='RESOURCECHANGES', null=True) + changed_info = models.TextField(db_column='CHANGEDINFO', null=True) + changed_ext_connectivity = models.TextField(db_column='CHANGEDEXTCONNECTIVITY', null=True) + links = models.TextField(db_column='LINKS', null=False)