update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try

[osm/SO.git] / rwlaunchpad / test / launchpad_recovery

diff --git a/rwlaunchpad/test/launchpad_recovery b/rwlaunchpad/test/launchpad_recovery
index eea5d4a..362dacc 100755 (executable)
--- a/rwlaunchpad/test/launchpad_recovery
+++ b/rwlaunchpad/test/launchpad_recovery
@@ -79,7 +79,7 @@ class LaunchPad(rift.test.dts.AbstractDTSTest):
     @classmethod
     def configure_schema(cls):
         schema =  RwYang.Model.load_and_merge_schema(rwvcs.get_schema(), 'librwcal_yang_gen.so', 'Rwcal')
-        cls.model = RwYang.Model.create_libncx()
+        cls.model = RwYang.Model.create_libyang()
         cls.model.load_schema_ypbc(schema)
         xml = cls.manifest.to_xml_v2(cls.model, 1)
         xml = re.sub('rw-manifest:', '', xml)
@@ -96,7 +96,7 @@ class LaunchPad(rift.test.dts.AbstractDTSTest):
         manifest = rwmanifest.Manifest()
         manifest.bootstrap_phase = rwmanifest.BootstrapPhase.from_dict({
             "rwmgmt": {
-                "northbound_listing": [ "cli_launchpad_schema_listing.txt" ]
+                "northbound_listing": [ "platform_schema_listing.txt", "platform_mgmt_schema_listing.txt", "cli_launchpad_schema_listing.txt" ]
             }, 
             "rwtasklet": {
                 "plugin_name": "rwinit-c"
@@ -210,15 +210,7 @@ class LaunchPad(rift.test.dts.AbstractDTSTest):
                                             "recovery_action": "RESTART",
                                             "config_ready": True
                                         }
-                                    }, 
-#                                   {
-#                                       "name": "Start the RW.CLI", 
-#                                       "start": {
-#                                           "component_name": "RW.CLI", 
-#                                           "recovery_action": "RESTART",
-#                                           "config_ready": True
-#                                       }
-#                                   }, 
+                                    },
                                     {
                                         "name": "Start the RW.Proc_1.Restconf", 
                                         "start": {
@@ -227,14 +219,6 @@ class LaunchPad(rift.test.dts.AbstractDTSTest):
                                             "config_ready": True
                                         }
                                     }, 
-#                                   {
-#                                       "name": "Start the RW.Proc_2.RestPortForward", 
-#                                       "start": {
-#                                           "component_name": "RW.Proc_2.RestPortForward", 
-#                                           "recovery_action": "RESTART",
-#                                           "config_ready": True
-#                                       }
-#                                   }, 
                                     {
                                         "name": "Start the RW.Proc_3.CalProxy", 
                                         "start": {
@@ -364,26 +348,6 @@ class LaunchPad(rift.test.dts.AbstractDTSTest):
                         "plugin_name": "restconf"
                     }
                 }, 
-#               {
-#                   "component_name": "RW.Proc_2.RestPortForward", 
-#                   "component_type": "RWPROC", 
-#                   "rwproc": {
-#                       "tasklet": [{
-#                           "name": "Start RW.RestPortForward for RW.Proc_2.RestPortForward", 
-#                           "component_name": "RW.RestPortForward", 
-#                           "recovery_action": "RESTART",
-#                           "config_ready": True
-#                       }]
-#                   }
-#               }, 
-#               {
-#                   "component_name": "RW.RestPortForward", 
-#                   "component_type": "RWTASKLET", 
-#                   "rwtasklet": {
-#                       "plugin_directory": "./usr/lib/rift/plugins/restportforward", 
-#                       "plugin_name": "restportforward"
-#                   }
-#               }, 
                 {
                     "component_name": "RW.Proc_3.CalProxy", 
                     "component_type": "RWPROC",