commit b45e9c2c3e44d3c3a5b7300abb529894337407c0
author Jeremy Mowery <jermowery@email.arizona.edu> Wed Nov 11 16:32:10 2015 -0500
committer Jeremy Mowery <jermowery@email.arizona.edu> Wed Nov 11 16:32:10 2015 -0500
tree 55e6c33fbb0a2545380a4710a00a6b4ee261583c
parent d0b32e04483463f317b9abd2232a718b1e359447

Cleanup models.py

xos/helloworldservice/models.py

diff --git a/xos/helloworldservice/models.py b/xos/helloworldservice/models.py
index c8ee541..2ca7f00 100644
--- a/xos/helloworldservice/models.py
+++ b/xos/helloworldservice/models.py
@@ -1,17 +1,4 @@
-from django.db import models
-from core.models import Service, PlCoreBase, Slice, Instance, Tenant, TenantWithContainer, Node, Image, User, Flavor, Subscriber
-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
-import traceback
-from xos.exceptions import *
-from core.models import SlicePrivilege, SitePrivilege
-from sets import Set
-from core.models.plcorebase import StrippedCharField
-
+from core.models import Service, TenantWithContainer
 
 HELLO_WORLD_KIND = "helloworldservice"
 
@@ -20,8 +7,8 @@
 
     class Meta:
 	proxy = True
-        app_label = "helloworldservice"
-        verbose_name = "Hello World Service"
+	app_label = "helloworldservice"
+	verbose_name = "Hello World Service"
 
 class HelloWorldTenant(TenantWithContainer):
     class Meta:
@@ -30,21 +17,9 @@
     KIND = HELLO_WORLD_KIND
     default_attributes = {'display_message': 'Hello World!'}
     def __init__(self, *args, **kwargs):
-        hello_world_service_services = HelloWorldService.get_service_objects().all()
-        if hello_world_service_services:
-            self._meta.get_field("provider_service").default = hello_world_service_services[0].id
         super(HelloWorldTenant, self).__init__(*args, **kwargs)
 
     def save(self, *args, **kwargs):
-        if not self.creator:
-            if not getattr(self, "caller", None):
-                # caller must be set when creating a vCPE since it creates a slice
-                raise XOSProgrammingError("HelloWorldTennant's self.caller was not set")
-            self.creator = self.caller
-            if not self.creator:
-                raise XOSProgrammingError("HelloWorldTennant's self.creator was not set")
-
-        
         super(HelloWorldTenant, self).save(*args, **kwargs)
 
 
@@ -54,7 +29,9 @@
 
     @property
     def display_message(self):
-	return self.get_attribute("display_message", self.default_attributes['display_message'])
+        return self.get_attribute(
+		"display_message",
+		self.default_attributes['display_message'])
 
     @display_message.setter
     def display_message(self, value):

xos/observers/helloworldservice/start.sh

diff --git a/xos/observers/helloworldservice/start.sh b/xos/observers/helloworldservice/start.sh
deleted file mode 100755
index ad83332..0000000
--- a/xos/observers/helloworldservice/start.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export XOS_DIR=/opt/xos
-python helloworldservice-observer.py  -C $XOS_DIR/observers/helloworldservice/helloworldservice_observer_config