[SDFAB-1021] Make targets to access different ONOS instances and set log (#274)

* [SDFAB-1021] Make target to access different ONOS instances and set log * Address review comments * Update onos-test tools * Add missing return

Author: daniele-moro

scenarios/Makefile

@@ -65,10 +65,10 @@ $(SCENARIOS): onos-test ./tmp /tmp/stc ./tmp/.env.docker
 deps: pull build stc-dev-build onos-test
 
 onos-test:
-curl -sS --fail https://repo1.maven.org/maven2/org/onosproject/onos-releases/2.5.4/onos-test-2.5.4.tar.gz --output onos-test.tar.gz
+curl -sS --fail https://repo1.maven.org/maven2/org/onosproject/onos-releases/2.5.7-rc3/onos-test-2.5.7-rc3.tar.gz --output onos-test.tar.gz
 tar xf onos-test.tar.gz
 rm onos-test.tar.gz
-mv onos-test-2.5.4 onos-test
+mv onos-test-2.5.7-rc3 onos-test
 
 #FIXME: remove once 'quotes' branch is merged and 2.6 released:
 stc-dev-build:
@@ -102,12 +102,28 @@ mn-cli: ./tmp/.env.docker
 mn-log:
 docker logs -f mininet
 
-onos-cli:
+onos-cli: onos-cli1
+
+onos-cli1:
 ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -o LogLevel=ERROR -p 8101 localhost
 
-onos-log: ./tmp/.env.docker
+onos-cli2:
+ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -o LogLevel=ERROR -p 8102 localhost
+
+onos-cli3:
+ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -o LogLevel=ERROR -p 8103 localhost
+
+onos-log: onos-log1
+
+onos-log1: ./tmp/.env.docker
 ${DOCKER_COMPOSE_CMD} logs -f onos1
 
+onos-log2: ./tmp/.env.docker
+${DOCKER_COMPOSE_CMD} logs -f onos2
+
+onos-log3: ./tmp/.env.docker
+${DOCKER_COMPOSE_CMD} logs -f onos3
+
 onos-ui:
 open http://localhost:8181/onos/ui
 

scenarios/bin/onos-cli

@@ -0,0 +1,11 @@
+#!/bin/bash
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+# SPDX-License-Identifier: Apache-2.0
+
+set -ex
+
+node=$1
+cliCmd=$2
+KARAF_VERSION=$(grep "KARAF_VERSION=" "${ONOS_ROOT}"/tools/build/envDefaults | awk -F '=' '{print $2}')
+
+${DOCKER_COMPOSE_CMD} exec -T "${node}" apache-karaf-"${KARAF_VERSION}"/bin/client "${cliCmd}"

scenarios/setup.xml

@@ -70,10 +70,10 @@
  exec="onos-check-apps ${OC#} org.omecproject.up4 includes"
  requires="Up4-App-Install-Local-Build"/>
  <step name="Up4-Set-Log-Debug-${#}"
- exec="onos ${OC#} log:set DEBUG org.omecproject.up4"
+ exec="onos-cli ${OD#} 'log:set DEBUG org.omecproject.up4'"
  requires="Onos-Check-Up4-App-${#}"/>
  <step name="Onos-Enable-Grpc-Log-${#}"
- exec="onos ${OC#} cfg set org.onosproject.grpc.ctl.GrpcChannelControllerImpl enableMessageLog true"
+ exec="onos-cli ${OD#} 'cfg set org.onosproject.grpc.ctl.GrpcChannelControllerImpl enableMessageLog true'"
  requires="Onos-Check-Up4-App-${#}"/>
  <step name="Onos-Check-Components-${#}" exec="onos-check-components ${OC#}"
  delay="5" requires="Onos-Check-Up4-App-${#}"/>