Update report resoure code and other files

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / database / models.py

diff --git a/lcm/lcm/pub/database/models.py b/lcm/lcm/pub/database/models.py
index e01e11f..e46f7af 100644 (file)
--- 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
 
 
@@ -158,13 +159,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)
@@ -279,36 +280,3 @@ class CPInstModel(models.Model):
     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)
-
-class VimModel(models.Model):
-    vimid = models.IntegerField(db_column='CMSERVERID', primary_key=True)
-    name = models.CharField(db_column='NAME', max_length=255, blank=True, null=True)
-    type = models.CharField(db_column='CMSTYPE', max_length=255, blank=True, null=True)
-    imageurl = models.CharField(db_column='IMAGEURL', max_length=1024, blank=True, null=True)
-    apiurl = models.CharField(db_column='APIURL', max_length=1024, blank=True, null=True)
-    version = models.CharField(db_column='VER', max_length=1024, blank=True, null=True)
-    supportnotification = models.IntegerField(db_column='SUPPORTNOTIFICATION', default=0)
-    longitude = models.CharField(db_column='LONGITUDE', max_length=1024, blank=True, null=True)
-    latitude = models.CharField(db_column='LATITUDE', max_length=1024, blank=True, null=True)
-    grantexclude = models.CharField(db_column='GRANTEXCLUDE', max_length=1, default='0', blank=True, null=True)
-    slalevel = models.IntegerField(db_column='SLALEVEL', default=0)
-
-    class Meta:
-        db_table = 'CMSSERVER'
-
-    def __unicode__(self):
-        return '%s' % self.name
-
-
-class VimUserModel(models.Model):
-    class Meta:
-        db_table = 'CMSSERVER_USER'
-
-    uuid = models.CharField(db_column='UUID', primary_key=True, max_length=255)
-    vimid = models.IntegerField(db_column='CMSERVERID')
-    username = models.CharField(db_column='USERNAME', max_length=255)
-    password = models.CharField(db_column='PWD', max_length=255, blank=True)
-    defaulttenant = models.CharField(db_column='TENANT', max_length=255, blank=True)
-
-    def __unicode__(self):
-        return '%s' % self.username
\ No newline at end of file