From b4049c359272814225a7ac594ac5c53a049833ca Mon Sep 17 00:00:00 2001 From: Nicolas Hu Date: Fri, 18 Sep 2020 13:34:00 -0400 Subject: [PATCH] update onboard workflow Change-Id: Ie250500c6e4c4644bf49c85f4e6c4e74a322bfc7 Signed-off-by: Jun (Nicolas) Hu --- dashboard/webapp-frontend/src/app/onboard/onboard.component.ts | 8 ++++---- docs/release-notes.rst | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dashboard/webapp-frontend/src/app/onboard/onboard.component.ts b/dashboard/webapp-frontend/src/app/onboard/onboard.component.ts index 4f843db7..adf85968 100644 --- a/dashboard/webapp-frontend/src/app/onboard/onboard.component.ts +++ b/dashboard/webapp-frontend/src/app/onboard/onboard.component.ts @@ -52,7 +52,7 @@ export class OnboardComponent implements OnInit { ngOnInit(): void { this.urlOnboardForm = new FormGroup({ configURL: new FormControl('', [Validators.required]), - schemaURL: new FormControl('', [Validators.required]) + schemaURL: new FormControl('') }) } ; @@ -60,11 +60,9 @@ export class OnboardComponent implements OnInit { controlsSchema: File; descriptor = { "config-file.json": {}, - "controls-schema.json": {} } descriptor_url = { "config-file.json_url": "", - "controls-schema.json_url": "" } uploadFromLocal() { @@ -92,7 +90,9 @@ export class OnboardComponent implements OnInit { uploadFromURL(data) { this.descriptor_url["config-file.json_url"] = data.configURL; - this.descriptor_url["controls-schema.json_url"] = data.schemaURL; + if (data.schemaURL) { + this.descriptor_url["controls-schema.json_url"] = data.schemaURL; + } this.loadingDialogService.startLoading('Onboarding xApp'); this.xappOnboarderService.onboardXappURL(this.descriptor_url, this.data.instanceKey) .pipe( diff --git a/docs/release-notes.rst b/docs/release-notes.rst index ae47afb6..c1dd79ef 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -5,8 +5,9 @@ RIC Dashboard Release Notes =========================== -Version 2.1.0, 26 Aug 2020 +Version 2.1.0, 18 Sep 2020 -------------------------- +* Update the onboard workflow, set controlsSchema as optional * Update the workflow of configure running Xapp in Dashboard (`OAM-110 `_) * Extend the Dashboard Xapp deploy workflow to accept configuration (`OAM-109 `_) * Add Xapp Onboarder client to backend (`OAM-108 `_) -- 2.16.6