commit 8c799681ac1cf3383807d6eb404f56b71f938aba
author KIRAN KASHALKAR <kiran.kashalkar@riftio.com> Mon Oct 03 18:17:27 2016 -0400
committer KIRAN KASHALKAR <kiran.kashalkar@riftio.com> Mon Oct 03 19:11:14 2016 -0400
tree da4e1760c9874e4d6d4d8e06e83025147a43465c
parent c827d48c2a9ed56690446d2855df28eb43d123a8

Revert "RIFT-14721: Added update mode for RO account, also enabled unit tests for ro_account"

This reverts commit c827d48c2a9ed56690446d2855df28eb43d123a8.

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

rwlaunchpad/test/CMakeLists.txt

diff --git a/rwlaunchpad/test/CMakeLists.txt b/rwlaunchpad/test/CMakeLists.txt
index 1c18e26..bd1a51e 100644
--- a/rwlaunchpad/test/CMakeLists.txt
+++ b/rwlaunchpad/test/CMakeLists.txt
@@ -59,11 +59,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/utest_rwnsm.py
   )
 
-rift_py3test(utest_ro_account
-  TEST_ARGS
-  ${CMAKE_CURRENT_SOURCE_DIR}/utest_ro_account.py
-  )
-
 rift_py3test(tosca_ut
   TEST_ARGS
   ${CMAKE_CURRENT_SOURCE_DIR}/tosca_ut.py

rwlaunchpad/test/utest_ro_account.py

diff --git a/rwlaunchpad/test/utest_ro_account.py b/rwlaunchpad/test/utest_ro_account.py
old mode 100755
new mode 100644
index aa485ef..6e480d4
--- a/rwlaunchpad/test/utest_ro_account.py
+++ b/rwlaunchpad/test/utest_ro_account.py
@@ -114,7 +114,7 @@
         mock_orch_acc = launchpadyang.ResourceOrchestrator.from_dict(
                 {'name': 'rift-ro', 'account_type': 'rift_ro', 'rift_ro': {'rift_ro': True}})
 
-        # Test rift-ro plugin CREATE
+        # Test rift-ro plugin
         w_xpath = "C,/rw-launchpad:resource-orchestrator"
         xpath = w_xpath
         yield from self.publisher.publish(w_xpath, xpath, mock_orch_acc)
@@ -122,36 +122,16 @@
 
         assert type(orch.ro_plugin) is cloud.RwNsPlugin
 
-        # Test Openmano plugin CREATE
+        # Test Openmano plugin
         mock_orch_acc = launchpadyang.ResourceOrchestrator.from_dict(
                 {'name': 'openmano',
                  'account_type': 'openmano',
-                 'openmano': {'tenant_id': "abc",
-                              "port": 9999,
-                              "host": "10.64.11.77"}})
+                 'openmano': {'tenant_id': "abc"}})
         yield from self.publisher.publish(w_xpath, xpath, mock_orch_acc)
         yield from asyncio.sleep(5, loop=self.loop)
 
+        print (type(orch.ro_plugin))
         assert type(orch.ro_plugin) is openmano_nsm.OpenmanoNsPlugin
-        assert orch.ro_plugin._cli_api._port  == mock_orch_acc.openmano.port
-        assert orch.ro_plugin._cli_api._host  == mock_orch_acc.openmano.host
-
-        # Test update
-        mock_orch_acc.openmano.port = 9789
-        mock_orch_acc.openmano.host = "10.64.11.78"
-        yield from self.dts.query_update("C,/rw-launchpad:resource-orchestrator",
-                rwdts.XactFlag.ADVISE, mock_orch_acc)
-        assert orch.ro_plugin._cli_api._port  == mock_orch_acc.openmano.port
-        assert orch.ro_plugin._cli_api._host  == mock_orch_acc.openmano.host
-
-        # Test update when a live instance exists
-        # Exception should be thrown
-        orch.handle_nsr(None, rwdts.QueryAction.CREATE)
-        mock_orch_acc.openmano.port = 9788
-
-        with self.assertRaises(Exception):
-            yield from self.dts.query_update("C,/rw-launchpad:resource-orchestrator",
-                    rwdts.XactFlag.ADVISE, mock_orch_acc)
 
         # Test delete
         yield from self.dts.query_delete("C,/rw-launchpad:resource-orchestrator",