From a266e8fac20d3e5a66f5fdcb9c66f703ffdfb33b Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Fri, 3 Mar 2017 01:53:45 +0530 Subject: [PATCH] Update RIFT platform code Signed-off-by: Philip Joseph --- BUILD.sh | 8 ++++---- rwlaunchpad/test/launchpad.py | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/BUILD.sh b/BUILD.sh index 54e8d96f..eb0c2997 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -114,10 +114,10 @@ fi if [[ $PLATFORM == ub16 ]]; then PLATFORM_REPOSITORY=${1:-OSM} - PLATFORM_VERSION=${2:-4.3.1.0.53704} + PLATFORM_VERSION=${2:-4.99.1.1.57142} elif [[ $PLATFORM == fc20 ]]; then PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published - PLATFORM_VERSION=${2:-4.3.1.0.53705} + PLATFORM_VERSION=${2:-4.99.1.1.57142} else echo "Internal error: unknown platform $PLATFORM" exit 1 @@ -186,8 +186,8 @@ if [[ $PLATFORM == ub16 ]]; then rw.core.util-util=${PLATFORM_VERSION} \ rw.core.rwvx-rwvx=${PLATFORM_VERSION} \ rw.core.rwvx-rwdts=${PLATFORM_VERSION} \ - rw.automation.core-RWAUTO=${PLATFORM_VERSION} \ - rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION} + rw.automation.core-RWAUTO=${PLATFORM_VERSION} + # rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION} sudo apt-get install python-cinderclient diff --git a/rwlaunchpad/test/launchpad.py b/rwlaunchpad/test/launchpad.py index 0ec3d188..5b40b906 100755 --- a/rwlaunchpad/test/launchpad.py +++ b/rwlaunchpad/test/launchpad.py @@ -40,6 +40,7 @@ import rift.rwcal.cloudsim.net from rift.vcs.ext import ClassProperty + logger = logging.getLogger(__name__) @@ -421,7 +422,7 @@ class Demo(rift.vcs.demo.Demo): GlanceServer(), rift.vcs.DtsRouterTasklet(), rift.vcs.MsgBrokerTasklet(), - rift.vcs.RestPortForwardTasklet(), + #rift.vcs.RestPortForwardTasklet(), rift.vcs.RestconfTasklet(), rift.vcs.RiftCli(), rift.vcs.uAgentTasklet(), @@ -548,8 +549,8 @@ def main(argv=sys.argv[1:]): for f in os.listdir(cleanup_dir_name): if f.endswith(".aof") or f.endswith(".rdb"): os.remove(os.path.join(cleanup_dir_name, f)) - - # Remove the persistant DTS recovery files + + # Remove the persistant DTS recovery files for f in os.listdir(cleanup_dir_name): if f.endswith(".db"): os.remove(os.path.join(cleanup_dir_name, f)) @@ -569,11 +570,11 @@ def main(argv=sys.argv[1:]): # Create the prepared system from the demo system = rift.vcs.demo.prepared_system_from_demo_and_args(demo, args, - northbound_listing="cli_launchpad_schema_listing.txt", + northbound_listing=["cli_launchpad_schema_listing.txt"], netconf_trace_override=True) - confd_ip = socket.gethostbyname(socket.gethostname()) # TODO: This need to be changed when launchpad starts running on multiple VMs + # confd_ip = socket.gethostbyname(socket.gethostname()) rift.vcs.logger.configure_sink(config_file=None, confd_ip="127.0.0.1") # Start the prepared system -- 2.25.1