Ported the HUTN service to the new client

scripts/HUTN_service.py

@@ -4,7 +4,7 @@ import sys
 sys.path.append(COMPILER_PATH)
 sys.path.append("wrappers")
 from hutn_compiler.compiler import main as do_compile
-from modelverse_coded import *
+from modelverse import *
 import os
 
 import time

wrappers/classes/modelverse.xml

@@ -1495,13 +1495,14 @@
                     </transition>
 
                     <transition cond="self.expect_response_partial('', pop=False)" target="../wait_for_action/history">
+                        <script>
+                            #print("Unknown Error: " + self.responses[0])
+                            pass
+                        </script>
                         <raise event="exception">
                             <parameter expr="'UnknownError'"/>
                             <parameter expr="'Error: %s' % self.responses.pop(0)"/>
                         </raise>
-                        <script>
-                            print("Unknown Error")
-                        </script>
                     </transition>
                 </state>
 

wrappers/modelverse.py

@@ -65,6 +65,8 @@ def OUTPUT():
                 raise UnknownIdentifier()
             elif response.parameters[1] == "UnknownMetamodellingHierarchy":
                 raise UnknownMetamodellingHierarchy()
+            else:
+                raise UnknownError()
 
 def init(address_param="127.0.0.1:8001", timeout=20.0):
     global controller

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Tue Oct 31 11:35:41 2017
+Date:   Tue Oct 31 12:59:12 2017
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server
@@ -2194,8 +2194,9 @@ class Modelverse(RuntimeClassBase):
         return self.expect_response_partial('No conformance relation can be found ', pop=False)
     
     def _initialized_behaviour_operations_2_exec(self, parameters):
+        #print("Unknown Error: " + self.responses[0])
+        pass
         self.raiseInternalEvent(Event("exception", None, ['UnknownError', 'Error: %s' % self.responses.pop(0)]))
-        print("Unknown Error")
     
     def _initialized_behaviour_operations_2_guard(self, parameters):
         return self.expect_response_partial('', pop=False)
@@ -2389,7 +2390,6 @@ class Modelverse(RuntimeClassBase):
     
     def _initialized_http_mapper_init_0_exec(self, parameters):
         value = parameters[0]
-        print("HTTP output listening on " + str(self.taskname))
         self.big_step.outputEventOM(Event("narrow_cast", None, [self, self.http_clients[0], Event("HTTP_input", None, [urllib.urlencode({"op": "set_input", "data": json.dumps(value), "taskname": self.taskname}), None])]))
     
     def _initialized_http_mapper_init_0_guard(self, parameters):