commit 6360656d8cbaa1556814246ffbc48986929fae21
author Zack Williams <zdw@cs.arizona.edu> Wed Oct 05 16:01:40 2016 -0700
committer Zack Williams <zdw@cs.arizona.edu> Wed Oct 05 17:30:00 2016 -0700
tree 23078b6c1bc1f8c05fe3cb6e3ba96eeba1b08d37
parent 5d428221856e2302c6491a5281643f0bab9ee3a3

use tosca-parser
remove unnecessary includes

Change-Id: I092bb907c900de6008d3c8df51bda9859f9d66aa

xos/tosca/resources/onosapp.py

diff --git a/xos/tosca/resources/onosapp.py b/xos/tosca/resources/onosapp.py
index a65c717..0c7490a 100644
--- a/xos/tosca/resources/onosapp.py
+++ b/xos/tosca/resources/onosapp.py
@@ -1,16 +1,7 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-import pdb
-
+from xosresource import XOSResource
 from core.models import User, TenantAttribute, Service
 from services.onos.models import ONOSApp, ONOSService
 
-from xosresource import XOSResource
-
 class XOSONOSApp(XOSResource):
     provides = ["tosca.nodes.ONOSApp", "tosca.nodes.ONOSvBNGApp", "tosca.nodes.ONOSvOLTApp", "tosca.nodes.ONOSVTNApp", "tosca.nodes.ONOSvRouterApp"]
     xos_model = ONOSApp

xos/tosca/resources/onosservice.py

diff --git a/xos/tosca/resources/onosservice.py b/xos/tosca/resources/onosservice.py
index 3540dd0..47c7f1d 100644
--- a/xos/tosca/resources/onosservice.py
+++ b/xos/tosca/resources/onosservice.py
@@ -1,15 +1,7 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-
+from service import XOSService
 from core.models import ServiceAttribute
 from services.onos.models import ONOSService
 
-from service import XOSService
-
 class XOSONOSService(XOSService):
     provides = "tosca.nodes.ONOSService"
     xos_model = ONOSService