A few of the configurations for the ete testsuite were baked into
the testsuite file. This change moves those configs to
the global properties file and allows them to be configured out of
the nanobot values.yaml. This change only affects the nanobot
version of those files.
The change also makes a minor update to elminate the requirement
for a host path for logging; that is now optional.
signed-off-by: dave kormann <dk3239@att.com>
Change-Id: I02be793f3a5a6f7f51a7ec081ad372aead1f66f9
#
${GLOBAL_INJECTED_DBAAS_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.dbaas.tcp" .) $ricplt }}
${GLOBAL_DBAAS_SERVER_PORT} {{ include "common.serviceport.dbaas.tcp" . }}
#
${GLOBAL_INJECTED_DBAAS_IP_ADDR} {{ printf "%s.%s" (include "common.servicename.dbaas.tcp" .) $ricplt }}
${GLOBAL_DBAAS_SERVER_PORT} {{ include "common.serviceport.dbaas.tcp" . }}
+#
+${GLOBAL_TEST_XAPP} {{ default "xapp-std" .Values.ric.robot.environment.xapp }}
+#
+${GLOBAL_TEST_NODEB_NAME} {{ default "AAAA456789" .Values.ric.robot.environment.gNodeB.name }}
+${GLOBAL_TEST_NODEB_ADDRESS} {{ default "10.0.0.3" .Values.ric.robot.environment.gNodeB.address }}
+${GLOBAL_TEST_NODEB_PORT} {{ default "36421" .Values.ric.robot.environment.gNodeB.port }}
\ No newline at end of file
Resource ../resources/dashboard/dashboard_interface.robot
*** Variables ***
Resource ../resources/dashboard/dashboard_interface.robot
*** Variables ***
-${TEST_XAPPNAME} xapp-std
-${TEST_XAPPID} 101
-${TEST_NODE_B_NAME} AAAA456789
-${TEST_NODE_B_IP} 10.0.0.3
-${TEST_NODE_B_PORT} 36421
+${TEST_XAPPNAME} ${GLOBAL_TEST_XAPP}
+${TEST_NODE_B_NAME} ${GLOBAL_TEST_NODEB_NAME}
+${TEST_NODE_B_IP} ${GLOBAL_TEST_NODEB_ADDRESS}
+${TEST_NODE_B_PORT} ${GLOBAL_TEST_NODEB_PORT}
- name: robot-etc
mountPath: /robot/etc
readOnly: false
- name: robot-etc
mountPath: /robot/etc
readOnly: false
+ {{- if .Values.ric.robot.log }}
- name: robot-log
mountPath: /robot/log
readOnly: false
- name: robot-log
mountPath: /robot/log
readOnly: false
- name: robot-bin
mountPath: /robot/bin
readOnly: true
- name: robot-bin
mountPath: /robot/bin
readOnly: true
{{- if not .Values.ric.robot.job.failOnTestFail }}
- "--NoStatusRC"
{{- end }}
{{- if not .Values.ric.robot.job.failOnTestFail }}
- "--NoStatusRC"
{{- end }}
+ {{- if .Values.ric.robot.log }}
+ {{- else }}
+ - "-o"
+ - "NONE"
+ - "-l"
+ - "NONE"
+ - "-r"
+ - "NONE"
+ - "-L"
+ - "NONE"
+ {{- end }}
- "--console"
- "verbose"
- "-C"
- "--console"
- "verbose"
- "-C"
- name: robot-etc
mountPath: /robot/etc
readOnly: true
- name: robot-etc
mountPath: /robot/etc
readOnly: true
+ {{- if .Values.ric.robot.log }}
- name: robot-log
mountPath: /robot/log
readOnly: false
- name: robot-log
mountPath: /robot/log
readOnly: false
# for compatability with the ric robot, we mount
# both properties files and interface libraries
# under resources/.
# for compatability with the ric robot, we mount
# both properties files and interface libraries
# under resources/.
- name: robot-etc
emptyDir: {}
- name: robot-log
- name: robot-etc
emptyDir: {}
- name: robot-log
+ {{- if .Values.ric.robot.log }}
hostPath:
path: {{ default "/opt/ric/robot/log" .Values.ric.robot.log }}
type: DirectoryOrCreate
hostPath:
path: {{ default "/opt/ric/robot/log" .Values.ric.robot.log }}
type: DirectoryOrCreate
- name: robot-bin
configMap:
name: robot-bin
- name: robot-bin
configMap:
name: robot-bin
- # host filesystem path where robot
- # output will be stored
- log: /opt/ric/robot/log
+ # If specified, a host filesystem
+ # path where robot output will be stored
+ # log: /opt/ric/robot/log
#
# Active testsuites can be chosen by
# tag, testuite names, or both. leaving
#
# Active testsuites can be chosen by
# tag, testuite names, or both. leaving
create: true
# ... and specify the serviceaccount here:
# name: nanobot
create: true
# ... and specify the serviceaccount here:
# name: nanobot
+ #
+ environment:
+ # the name of a test xapp; the appmgr testsuite
+ # will attempt to deploy and undeploy this app;
+ # This should be an xapp which is "onboarded" to
+ # the appmgr but not deployed at the time the test
+ # is initiated.
+ xapp: xapp-std
+ gNodeB:
+ # the details of a test gNodeB, for [E/X]2 tests.
+ # This can be either a real gnodeb or a simulator,
+ # but in either case should exist prior to test
+ # initiation.
+ name: AAAA456789
+ address: 10.0.0.3
+ port: 36421