X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fpub%2Fdatabase%2Fmodels.py;h=e46f7af9e674afeb27f60628d0340179e79fd5fb;hb=e1a495b59a429486b3e5566bec86895cbbee9bbe;hp=ff7f290de5d3fdf731badfeabd650e38d5d42a62;hpb=9a8f9cd744b44514cf94e15c84f315751f493c3c;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py index ff7f290d..e46f7af9 100644 --- a/lcm/lcm/pub/database/models.py +++ b/lcm/lcm/pub/database/models.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from django.db import models @@ -19,40 +20,19 @@ class NfInstModel(models.Model): db_table = 'NFINST' nfinstid = models.CharField(db_column='NFINSTID', max_length=200, primary_key=True) - mnfinstid = models.CharField(db_column='M_NFINSTID', max_length=200, blank=True, null=True) - nf_name = models.CharField(db_column='NFNAME', max_length=100, blank=True, null=True) #CreateVnfRequest.vnfInstanceName - template_id = models.CharField(db_column='TEMPLATEID', max_length=200, blank=True, null=True) - vnf_id = models.CharField(db_column='VNFID', max_length=200, blank=True, null=True) + nf_name = models.CharField(db_column='NFNAME', max_length=100, blank=True, null=True) # CreateVnfRequest.vnfInstanceName package_id = models.CharField(db_column='PACKAGEID', max_length=200, blank=True, null=True) - vnfm_inst_id = models.CharField(db_column='VNFMINSTID', max_length=200, blank=True, null=True) - multivim = models.IntegerField(db_column='MULTIVIM', default=0) - ns_inst_id = models.CharField(db_column='NSINSTID', max_length=200, blank=True, null=True) status = models.CharField(db_column='STATUS', max_length=20, blank=True, null=True) - flavour_id = models.CharField(db_column='FLAVOURID', max_length=200, blank=True, null=True) #InstantiateVnfRequest.flavourId - vnf_level = models.CharField(db_column='VNFLEVEL', max_length=200, blank=True, null=True) #InstantiateVnfRequest.instantiationLevelId + flavour_id = models.CharField(db_column='FLAVOURID', max_length=200, blank=True, null=True) # InstantiateVnfRequest.flavourId location = models.CharField(db_column='LOCATION', max_length=200, blank=True, null=True) - deploy_environment = models.CharField(db_column='DEPLOYENVIRONMENT', max_length=100, blank=True, null=True) - max_vm = models.IntegerField(db_column='MAXVM', blank=True, null=True) - max_cpu = models.IntegerField(db_column='MAXCPU', blank=True, null=True) - max_ram = models.IntegerField(db_column='MAXRAM', blank=True, null=True) - max_hd = models.IntegerField(db_column='MAXHD', blank=True, null=True) - max_shd = models.IntegerField(db_column='MAXSHD', blank=True, null=True) - max_net = models.IntegerField(db_column='MAXNET', blank=True, null=True) version = models.CharField(db_column='VERSION', max_length=255, null=True) vendor = models.CharField(db_column='VENDOR', max_length=255, null=True, blank=True) - producttype = models.CharField(db_column='PRODUCTTYPE', max_length=255, null=True) netype = models.CharField(db_column='NETYPE', max_length=255, null=True) vnfd_model = models.TextField(db_column='VNFDMODEL', max_length=20000, blank=True, null=True) - input_params = models.TextField(db_column='INPUTPARAMS', max_length=2000, blank=True, null=True) #InstantiateVnfRequest.additionalParams - scale_params = models.TextField(db_column='SCALEPARAMS', max_length=2000, null=True, blank=True) + input_params = models.TextField(db_column='INPUTPARAMS', max_length=2000, blank=True, null=True) # InstantiateVnfRequest.additionalParams create_time = models.CharField(db_column='CREATETIME', max_length=200, null=True, blank=True) lastuptime = models.CharField(db_column='LASTUPTIME', max_length=200, blank=True, null=True) - extension = models.TextField(db_column='EXTENSION', max_length=65535, blank=True, null=True) - initallocatedata = models.TextField(db_column='INITALLOCATEDATA', max_length=20000, blank=True, null=True) - predefinedvm = models.TextField(db_column='PREDEFINEDVM', max_length=65535, blank=True, null=True) - vnfextendtype = models.CharField(db_column='VNFEXTENDTYPE', max_length=255, null=True) - instantiationState = models.CharField(db_column='INSTANTIATIONSTATE', max_length=200, blank=True, null=True) nf_desc = models.CharField(db_column='VNFINSTANCEDESC', max_length=200, blank=True, null=True) vnfdid = models.CharField(db_column='VNFDID', max_length=200, blank=True, null=True) vnfSoftwareVersion = models.CharField(db_column='VNFSOFTWAREVER', max_length=200, blank=True, null=True) @@ -125,14 +105,16 @@ 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) + nodeId = models.CharField(db_column='NODEID', max_length=255, null=True) class VmInstModel(models.Model): class Meta: @@ -140,16 +122,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: @@ -158,19 +146,28 @@ 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: 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) - extraspecs = models.CharField(db_column='EXTRASPECS', max_length=255) + tenant = models.CharField(db_column='TENANT', max_length=255, null=True) + 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) class NetworkInstModel(models.Model): @@ -184,7 +181,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) @@ -192,9 +188,13 @@ 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) + nodeId = models.CharField(db_column='NODEID', max_length=255, null=True) class SubNetworkInstModel(models.Model): class Meta: @@ -215,6 +215,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: @@ -257,7 +261,10 @@ 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) + nodeId = models.CharField(db_column='NODEID', max_length=255, null=True) class CPInstModel(models.Model): class Meta: @@ -272,4 +279,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)