commit 34726b8a1343b588d7e33148b4e03b3b7f0d20ee
author Scott Baker <smbaker@gmail.com> Mon Mar 13 17:21:54 2017 -0700
committer Scott Baker <smbaker@gmail.com> Mon Mar 13 22:37:33 2017 -0700
tree 91fef5ba5fc85c8aba13dc443fbeccd94924c68c
parent 62918298d4fc6b670123e71309d96b84b3383fea

CORD-876 eliminate proxy models in VTN service

Change-Id: Ie417b6e6b52c38adf513a77d62d57112cb1827d3

xos/models.py

diff --git a/xos/models.py b/xos/models.py
index 1c6f7bf..ec2162a 100644
--- a/xos/models.py
+++ b/xos/models.py
@@ -1,13 +1,9 @@
 from django.db import models
-from core.models import Service, PlCoreBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, Subscriber, NetworkParameter, NetworkParameterType, Port, AddressPool
+from core.models import Service
 from core.models.plcorebase import StrippedCharField
 import os
 from django.db import models, transaction
 from django.forms.models import model_to_dict
-from django.db.models import Q
-from operator import itemgetter, attrgetter, methodcaller
-from core.models import Tag
-from core.models.service import LeastLoadedNodeScheduler
 import traceback
 from xos.exceptions import *
 from xos.config import Config
@@ -27,21 +23,17 @@
     class Meta:
         app_label = "vtn"
         verbose_name = "VTN Service"
-        proxy = True
 
-    simple_attributes = ( ("privateGatewayMac", "00:00:00:00:00:01"),
-                          ("localManagementIp", "172.27.0.1/24"),
-                          ("ovsdbPort", "6641"),
-                          ("sshPort", "22"),
-                          ("sshUser", "root"),
-                          ("sshKeyFile", "/root/node_key") ,
-                          ("mgmtSubnetBits", "24"),
-                          ("xosEndpoint", "http://xos/"),
-                          ("xosUser", "padmin@vicci.org"),
-                          ("xosPassword", "letmein"),
-                          ("vtnAPIVersion", 1),
-                          ("controllerPort", "onos-cord:6653"),
+    privateGatewayMac = StrippedCharField(max_length=30, default="00:00:00:00:00:01")
+    localManagementIp = StrippedCharField(max_length=30, default="172.27.0.1/24")
+    ovsdbPort = models.IntegerField(default=6641)
+    sshPort = models.IntegerField(default=22)
+    sshUser = StrippedCharField(max_length=30, default="root")
+    sshKeyFile = StrippedCharField(max_length=1024, default="/root/node_key")
+    mgmtSubnetBits = models.IntegerField(default=24)
+    xosEndpoint = StrippedCharField(max_length=1024, default="http://xos/")
+    xosUser = StrippedCharField(max_length=255, default="padmin@vicci.org")
+    xosPassword = StrippedCharField(max_length=255, default="letmein")
+    vtnAPIVersion = models.IntegerField(default=1)
+    controllerPort = StrippedCharField(max_length=255, default="onos-cord:6653")
 
-                         )
-
-VTNService.setup_simple_attributes()