From ff1b8db07818308a6bf577b083a008a6717f0466 Mon Sep 17 00:00:00 2001 From: sushant Date: Tue, 7 Dec 2021 11:04:18 +0530 Subject: [PATCH 1/4] - added empty open_flow in quali configuration Signed-off-by: Sushant Bawiskar --- .github/workflows/quali-basic-manual.yml | 2 ++ .github/workflows/quali.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/quali-basic-manual.yml b/.github/workflows/quali-basic-manual.yml index 6fbaa96b1..9341a724f 100644 --- a/.github/workflows/quali-basic-manual.yml +++ b/.github/workflows/quali-basic-manual.yml @@ -159,6 +159,8 @@ jobs: CONFIGURATION = { "basic": $(python .quali/get_configuration.py ${{ steps.start.outputs.res_id }}) } + + open_flow = {} RADIUS_SERVER_DATA = { "ip": "10.10.1.221", diff --git a/.github/workflows/quali.yml b/.github/workflows/quali.yml index b3e5bcd2c..4d3102538 100644 --- a/.github/workflows/quali.yml +++ b/.github/workflows/quali.yml @@ -182,7 +182,9 @@ jobs: CONFIGURATION = { "basic": $(python .quali/get_configuration.py ${{ steps.start.outputs.res_id }}) } - + + open_flow = {} + RADIUS_SERVER_DATA = { "ip": "10.10.1.221", "port": 1812, From 6aa69d1afb9ed0a1a1c419498eef63e8b13b5c39 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Tue, 7 Dec 2021 13:30:23 +0300 Subject: [PATCH 2/4] Chg: dev and qa chart to v2.4.0-RC5 --- .github/workflows/ucentralgw-dev-deployment.yaml | 6 +++--- .github/workflows/ucentralgw-qa-deployment.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index 80261549d..ffac5b21a 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -31,10 +31,10 @@ env: { "namespace": "dev01", "deploy_method": "git", - "chart_version": "v2.4.0-RC4", + "chart_version": "v2.4.0-RC5", "owgw_version": "v2.4.0-RC4", - "owsec_version": "v2.4.0-RC2", - "owfms_version": "v2.4.0-RC2", + "owsec_version": "v2.4.0-RC3", + "owfms_version": "v2.4.0-RC3", "owprov_version": "main", "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main" diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 4fd359761..72e88c9c4 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -31,10 +31,10 @@ env: { "namespace": "qa01", "deploy_method": "git", - "chart_version": "v2.4.0-RC4", + "chart_version": "v2.4.0-RC5", "owgw_version": "v2.4.0-RC4", - "owsec_version": "v2.4.0-RC2", - "owfms_version": "v2.4.0-RC2", + "owsec_version": "v2.4.0-RC3", + "owfms_version": "v2.4.0-RC3", "owprov_version": "main", "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main" From f3cbac53b9b8eaa5a7a9ea1eaef4b6538247b908 Mon Sep 17 00:00:00 2001 From: Max Brenner Date: Tue, 7 Dec 2021 11:56:52 +0100 Subject: [PATCH 3/4] default to any AP model and WIFI type Signed-off-by: Max Brenner --- .quali/start_reservation.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.quali/start_reservation.py b/.quali/start_reservation.py index 90a87e680..672deb7da 100644 --- a/.quali/start_reservation.py +++ b/.quali/start_reservation.py @@ -1,7 +1,6 @@ -import json import os -from cloudshell.api.cloudshell_api import UpdateTopologyGlobalInputsRequest, UpdateTopologyRequirementsInputsRequest +from cloudshell.api.cloudshell_api import UpdateTopologyGlobalInputsRequest import argparse @@ -16,8 +15,8 @@ def main(): parser.add_argument('--openwifi-sec-version', default='main') parser.add_argument('--openwifi-fms-version', default='main') parser.add_argument('--openwifi-ui-version', default='main') - parser.add_argument('--ap-model', default='EC420') - parser.add_argument('--wifi-type', default='Wifi5') + parser.add_argument('--ap-model', default='[Any]') + parser.add_argument('--wifi-type', default='[Any]') args = parser.parse_args() session = get_session() From 564ac90d0849bf1c48b2f19fa4afc74fda84d606 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 8 Dec 2021 10:48:54 +0300 Subject: [PATCH 4/4] Chg: dev and qa chart to v2.4.0-RC6 --- .github/workflows/ucentralgw-dev-deployment.yaml | 8 ++++---- .github/workflows/ucentralgw-qa-deployment.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ucentralgw-dev-deployment.yaml b/.github/workflows/ucentralgw-dev-deployment.yaml index ffac5b21a..8cadd6c4b 100644 --- a/.github/workflows/ucentralgw-dev-deployment.yaml +++ b/.github/workflows/ucentralgw-dev-deployment.yaml @@ -31,10 +31,10 @@ env: { "namespace": "dev01", "deploy_method": "git", - "chart_version": "v2.4.0-RC5", - "owgw_version": "v2.4.0-RC4", - "owsec_version": "v2.4.0-RC3", - "owfms_version": "v2.4.0-RC3", + "chart_version": "v2.4.0-RC6", + "owgw_version": "v2.4.0-RC5", + "owsec_version": "v2.4.0-RC4", + "owfms_version": "v2.4.0-RC4", "owprov_version": "main", "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main" diff --git a/.github/workflows/ucentralgw-qa-deployment.yaml b/.github/workflows/ucentralgw-qa-deployment.yaml index 72e88c9c4..c931b4906 100644 --- a/.github/workflows/ucentralgw-qa-deployment.yaml +++ b/.github/workflows/ucentralgw-qa-deployment.yaml @@ -31,10 +31,10 @@ env: { "namespace": "qa01", "deploy_method": "git", - "chart_version": "v2.4.0-RC5", - "owgw_version": "v2.4.0-RC4", - "owsec_version": "v2.4.0-RC3", - "owfms_version": "v2.4.0-RC3", + "chart_version": "v2.4.0-RC6", + "owgw_version": "v2.4.0-RC5", + "owsec_version": "v2.4.0-RC4", + "owfms_version": "v2.4.0-RC4", "owprov_version": "main", "owgwui_version": "v2.4.0-RC2", "owprovui_version": "main"