Merge branch 'add_http1_test' into 'develop'

Add HTTP/1 test

See merge request !174

test/all_nfs.robot

+# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The OpenAirInterface Software Alliance licenses this file to You under
+# the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.openairinterface.org/?page_id=698
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ------------------------------------------------------------------------------
+# For more information about the OpenAirInterface (OAI) Software Alliance:
+#   contact@openairinterface.org
+# ---------------------------------------------------------------------
+
+*** Settings ***
+Library    Process
+Library    CNTestLib.py
+Library    GNBSimTestLib.py
+Resource   common.robot
+
+Variables    vars.py
+
+Suite Setup    Launch NRF CN With PCF HTTP1
+Suite Teardown    Suite Teardown Default
+
+Test Setup    Test Setup With Gnbsim
+Test Teardown    Test Teardown With Gnbsim
+
+*** Test Cases ***
+
+Attach and Ping HTTP1
+    [Tags]    AMF  SMF  UDM  NRF  UDR  AUSF  UPF  PCF
+    Start Gnbsim    ${GNBSIM_IN_USE}
+    ${ip} =   Check Gnbsim IP    ${GNBSIM_IN_USE}
+
+    Ping From Gnbsim    ${GNBSIM_IN_USE}  ${EXT_DN1_IP}

test/common.robot

@@ -42,6 +42,20 @@ Launch NRF CN with PCF
     Start CN
     Check Core Network Health Status
 
+Launch NRF CN with PCF HTTP1
+    @{list} =    Create List  oai-amf   oai-smf   oai-udm   oai-nrf  oai-udr  oai-ausf  mysql  oai-ext-dn  oai-upf  oai-pcf
+    Prepare Scenario    ${list}   nrf-cn-pcf
+    @{replace_list} =  Create List  smf  support_features  use_local_pcc_rules
+    Replace In Config    ${replace_list}  no
+    @{replace_list} =  Create List  smf  support_features  use_local_subscription_info
+    Replace In Config    ${replace_list}  no
+    @{replace_list} =  Create List   http_version
+    Replace In Config    ${replace_list}  1
+
+    Start Trace    core_network
+    Start CN
+    Check Core Network Health Status
+
 Launch NRF CN For QoS
     @{list} =    Create List  oai-amf   oai-smf   oai-udm   oai-nrf  oai-udr  oai-ausf  mysql  oai-ext-dn  oai-ext-dn-2  oai-ext-dn-3  oai-upf  oai-pcf
     Prepare Scenario    ${list}   nrf-cn-qos
@@ -152,3 +166,14 @@ Deactive NF Registration in CN Config
     Replace In Config    ${replace_list}  no
     @{replace_list} =  Create List  amf  support_features_options  enable_smf_selection
     Replace In Config    ${replace_list}  no
+
+Test Setup With Gnbsim
+    ${gnbsim_name} =   Prepare Gnbsim
+    Set Test Variable   ${GNBSIM_IN_USE}   ${gnbsim_name}
+    Start Trace    ${TEST_NAME}
+
+Test Teardown With Gnbsim
+    Stop Gnbsim   ${GNBSIM_IN_USE}
+    Collect All Gnbsim Logs
+    Down Gnbsim    ${GNBSIM_IN_USE}
+    Stop Trace    ${TEST_NAME}

test/qos_tests.robot

@@ -29,8 +29,8 @@ Variables    vars.py
 Suite Setup    Launch NRF CN For QoS
 Suite Teardown    Suite Teardown Default
 
-Test Setup    Test Setup QoS Tests
-Test Teardown    Test Teardown QoS Tests
+Test Setup    Test Setup With Gnbsim
+Test Teardown    Test Teardown With Gnbsim
 
 *** Test Cases ***
 
@@ -125,15 +125,3 @@ QoS Flow GBR Session AMBR 2
     Wait And Verify Iperf3 Result    ${EXT_DN2_NAME}    5
     Wait And Verify Iperf3 Result    ${EXT_DN3_NAME}    10
 
-*** Keywords ***
-
-Test Setup QoS Tests
-    ${gnbsim_name} =   Prepare Gnbsim
-    Set Test Variable   ${GNBSIM_IN_USE}   ${gnbsim_name}
-    Start Trace    ${TEST_NAME}
-
-Test Teardown QoS Tests
-    Stop Gnbsim   ${GNBSIM_IN_USE}
-    Collect All Gnbsim Logs
-    Down Gnbsim    ${GNBSIM_IN_USE}
-    Stop Trace    ${TEST_NAME}