Changing ResourceManager naming for platform::ResourceName

[nepi.git] / test / resources / omf / omf6_vlc_wrong_critical.py

diff --git a/test/resources/omf/omf6_vlc_wrong_critical.py b/test/resources/omf/omf6_vlc_wrong_critical.py
index d3fbae9..ba49207 100755 (executable)
--- a/test/resources/omf/omf6_vlc_wrong_critical.py
+++ b/test/resources/omf/omf6_vlc_wrong_critical.py
@@ -41,21 +41,21 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.ec = ExperimentController(exp_id = str(OMFVLCWrongCaseAllCritical.id))
         OMFVLCWrongCaseAllCritical.id += 1
 
-        self.node1 = self.ec.register_resource("OMFNode")
+        self.node1 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node1, 'hostname', 'wlab12')
         self.ec.set(self.node1, 'xmppUser', "nepi")
         self.ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node1, 'xmppPort', "5222")
         self.ec.set(self.node1, 'xmppPassword', "1234")
         
-        self.iface1 = self.ec.register_resource("OMFWifiInterface")
+        self.iface1 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface1, 'name', "wlan0")
         self.ec.set(self.iface1, 'mode', "adhoc")
         self.ec.set(self.iface1, 'hw_mode', "g")
         self.ec.set(self.iface1, 'essid', "vlcexp")
         self.ec.set(self.iface1, 'ip', "10.0.0.12/24")
 
-        self.app1 = self.ec.register_resource("OMFApplication")
+        self.app1 = self.ec.register_resource("omf::Application")
         self.ec.set(self.app1, 'appid', 'Vlc#1')
         self.ec.set(self.app1, 'command', "/opt/vlc-1.1.13/cvlc /opt/10-by-p0d.avi --sout '#rtp{dst=10.0.0.49,port=1234,mux=ts}'")
         self.ec.set(self.app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
@@ -64,16 +64,16 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.ec.register_connection(self.node1, self.iface1)
 
     def test_deploy_wo_node(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")
         self.ec.set(self.iface2, 'ip', "10.0.0.49/24")
         
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -99,20 +99,20 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
 
     def test_deploy_wo_hostname(self):
 
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")
         self.ec.set(self.iface2, 'ip', "10.0.0.49/24")
         
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -137,16 +137,16 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_wo_iface(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'wlab49')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -171,21 +171,21 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_wo_channel(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'wlab49')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")
         self.ec.set(self.iface2, 'ip', "10.0.0.49/24")
 
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.node2, self.iface2)
@@ -208,20 +208,20 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_wo_ip(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'wlab49')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")
 
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
         self.ec.register_connection(self.iface1, self.channel)
@@ -246,24 +246,24 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_wo_app(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'wlab49')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")   
         self.ec.set(self.iface2, 'ip', "10.0.0.49/24")
 
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
-        self.app2 = self.ec.register_resource("OMFApplication")
+        self.app2 = self.ec.register_resource("omf::Application")
 
         self.ec.register_connection(self.iface1, self.channel)
         self.ec.register_connection(self.iface2, self.channel)
@@ -290,24 +290,24 @@ class OMFVLCWrongCaseAllCritical(unittest.TestCase):
         self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
 
     def test_deploy_wo_app_path(self):
-        self.node2 = self.ec.register_resource("OMFNode")
+        self.node2 = self.ec.register_resource("omf::Node")
         self.ec.set(self.node2, 'hostname', 'wlab49')
         self.ec.set(self.node2, 'xmppUser', "nepi")
         self.ec.set(self.node2, 'xmppServer', "xmpp-plexus.onelab.eu")
         self.ec.set(self.node2, 'xmppPort', "5222")
         self.ec.set(self.node2, 'xmppPassword', "1234")
 
-        self.iface2 = self.ec.register_resource("OMFWifiInterface")
+        self.iface2 = self.ec.register_resource("omf::WifiInterface")
         self.ec.set(self.iface2, 'name', "wlan0")
         self.ec.set(self.iface2, 'mode', "adhoc")
         self.ec.set(self.iface2, 'hw_mode', "g")
         self.ec.set(self.iface2, 'essid', "vlcexp")   
         self.ec.set(self.iface2, 'ip', "10.0.0.49/24")
 
-        self.channel = self.ec.register_resource("OMFChannel")
+        self.channel = self.ec.register_resource("omf::Channel")
         self.ec.set(self.channel, 'channel', "6")
 
-        self.app2 = self.ec.register_resource("OMFApplication")
+        self.app2 = self.ec.register_resource("omf::Application")
         self.ec.set(self.app2, 'appid', 'Vlc#2')
 
         self.ec.register_connection(self.iface1, self.channel)