Ric list in Policy instance Dialog Component

Issue-ID: NONRTRIC-425
Change-Id: Idc86b4538a41a2ef1fdc713ee46e1dd1c843c78c
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>

diff --git a/webapp-frontend/src/app/interceptor.mock.ts b/webapp-frontend/src/app/interceptor.mock.ts
index 8a1c3ab..05e1a4e 100644 (file)
--- a/webapp-frontend/src/app/interceptor.mock.ts
+++ b/webapp-frontend/src/app/interceptor.mock.ts
@@ -33,6 +33,8 @@ import * as policytypesList from './mock/policy-types.json';
 import * as policytypes1 from './mock/policy-type1.json';
 import * as policyinstanceedit from './mock/policy-instance-edit.json';
 import * as rics from './mock/rics.json';
+import * as ric1 from './mock/ric1.json';
+import * as ric2 from './mock/ric2.json';
 
 const urls = [
     {
@@ -91,6 +93,14 @@ const urls = [
         url: '/a1-policy/v2/policies/2000?ric=ric1&type=1',
         json: ''
     },
+    {
+        url: '/a1-policy/v2/rics?policytype_id=1',
+        json: ric1
+    },
+    {
+        url: '/a1-policy/v2/rics?policytype_id=',
+        json: ric2
+    },
     {
         url: 'api/enrichment/eijobs',
         json: eijobs

diff --git a/webapp-frontend/src/app/interfaces/ric.ts b/webapp-frontend/src/app/interfaces/ric.ts
new file mode 100644 (file)
index 0000000..7c115af
--- /dev/null
+++ b/webapp-frontend/src/app/interfaces/ric.ts
@@ -0,0 +1,28 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ * %%
+ * Copyright (C) 2021 Nordix Foundation
+ * %%
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ * ========================LICENSE_END===================================
+ */
+
+// Models of data used by the Policy Control
+
+export interface Ric {
+  ric_id: string;
+  managed_element_ids: any[];
+  policytype_ids: any[];
+  state: string;
+}

diff --git a/webapp-frontend/src/app/mock/ric1.json b/webapp-frontend/src/app/mock/ric1.json
new file mode 100644 (file)
index 0000000..de92d04
--- /dev/null
+++ b/webapp-frontend/src/app/mock/ric1.json
@@ -0,0 +1,15 @@
+{
+    "rics": [
+        {
+            "ric_id": "ric1",
+            "managed_element_ids": [
+                "kista_1",
+                "kista_2"
+            ],
+            "policytype_ids": [
+                "1"
+            ],
+            "state": "AVAILABLE"
+        }
+    ]
+}
\ No newline at end of file

diff --git a/webapp-frontend/src/app/mock/ric2.json b/webapp-frontend/src/app/mock/ric2.json
new file mode 100644 (file)
index 0000000..f6e36e8
--- /dev/null
+++ b/webapp-frontend/src/app/mock/ric2.json
@@ -0,0 +1,15 @@
+{
+    "rics": [
+        {
+            "ric_id": "ric2",
+            "managed_element_ids": [
+                "kista_1",
+                "kista_2"
+            ],
+            "policytype_ids": [
+                ""
+            ],
+            "state": "AVAILABLE"
+        }
+    ]
+}
\ No newline at end of file

diff --git a/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.html b/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.html
index da8ab5b..81df840 100644 (file)
--- a/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.html
+++ b/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.html
@@ -41,8 +41,8 @@
             <mat-select id="ricSelector" formControlName="ricSelector" matInput required [(value)]="this.ric"
                 placeholder="Target"
                 matTooltip="Element where the policy instance resides, e.g. a gNodeB or Near-RT RIC">
-                <mat-option *ngFor="let ric of this.allRics" [value]="ric">
-                    {{ric}}
+                <mat-option *ngFor="let ric of this.allRics.rics" [value]="ric">
+                    {{ric.ric_id}}
                 </mat-option>
             </mat-select>
             <div *ngIf="ricSelector.invalid && (ricSelector.dirty || ricSelector.touched)" class="alert mat-error"

diff --git a/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts b/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
index 976a4e4..66dcfb7 100644 (file)
--- a/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
+++ b/webapp-frontend/src/app/policy-control/no-type-policy-instance-dialog.component.ts
@@ -26,6 +26,7 @@ import { UiService } from '../services/ui/ui.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
 import * as uuid from 'uuid';
+import { Ric } from '../interfaces/ric';
 
 @Component({
   selector: 'rd-no-type-policy-instance-dialog',
@@ -39,7 +40,7 @@ export class NoTypePolicyInstanceDialogComponent implements OnInit {
   policyJson: string;
   darkMode: boolean;
   ric: string;
-  allRics: string[];
+  allRics: Ric[];
 
   constructor(
     private policySvc: PolicyService,
@@ -95,7 +96,7 @@ export class NoTypePolicyInstanceDialogComponent implements OnInit {
     const self: NoTypePolicyInstanceDialogComponent = this;
     this.policySvc.getRics('').subscribe(
       {
-        next(value) {
+        next(value:Ric[]) {
           self.allRics = value;
           console.log(value);
         },

diff --git a/webapp-frontend/src/app/policy-control/policy-control.component.ts b/webapp-frontend/src/app/policy-control/policy-control.component.ts
index 3a15226..ad3f13d 100644 (file)
--- a/webapp-frontend/src/app/policy-control/policy-control.component.ts
+++ b/webapp-frontend/src/app/policy-control/policy-control.component.ts
@@ -89,7 +89,7 @@ export class PolicyControlComponent implements OnInit {
     }
 
     private isSchemaEmpty(policyTypeSchema: PolicyTypeSchema): boolean {
-        return Object.keys(policyTypeSchema.schemaObject).length === 0;
+        return policyTypeSchema.schemaObject === '{}';
     }
 
     getPolicyTypeInfo(policyTypeSchema: PolicyTypeSchema): PolicyTypeInfo {

diff --git a/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.html b/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.html
index fdf80cb..fea3e84 100644 (file)
--- a/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.html
+++ b/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.html
@@ -44,8 +44,8 @@
             <mat-select id="ricSelector" formControlName="ricSelector" matInput required [(value)]="this.ric"
                 placeholder="Target"
                 matTooltip="Element where the policy instance resides, e.g. a gNodeB or Near-RT RIC">
-                <mat-option *ngFor="let ric of this.allRics" [value]="ric">
-                    {{ric}}
+                <mat-option *ngFor="let ric of this.allRics.rics" [value]="ric">
+                    {{ric.ric_id}}
                 </mat-option>
             </mat-select>
             <div *ngIf="ricSelector.invalid && (ricSelector.dirty || ricSelector.touched)">

diff --git a/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts b/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
index 47c95b9..bd4de27 100644 (file)
--- a/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
+++ b/webapp-frontend/src/app/policy-control/policy-instance-dialog.component.ts
@@ -31,6 +31,7 @@ import { UiService } from '../services/ui/ui.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { FormGroup, FormControl, Validators } from '@angular/forms';
 import { ChangeDetectorRef } from '@angular/core';
+import { Ric } from '../interfaces/ric';
 
 
 @Component({
@@ -85,14 +86,14 @@ export class PolicyInstanceDialogComponent implements OnInit, AfterViewInit {
     policyTypeName: string;
     darkMode: boolean;
     ric: string;
-    allRics: string[];
+    allRics: Ric[];
 
     private fetchRics() {
         console.log('fetchRics ' + this.policyTypeName);
         const self: PolicyInstanceDialogComponent = this;
         this.dataService.getRics(this.policyTypeName).subscribe(
             {
-                next(value) {
+                next(value:Ric[]) {
                     self.allRics = value;
                     console.log(value);
                 },

diff --git a/webapp-frontend/src/app/services/policy/policy.service.ts b/webapp-frontend/src/app/services/policy/policy.service.ts
index 50c5449..15ab710 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.ts
@@ -24,6 +24,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PolicyInstance, PolicyInstanceAck, PolicyInstances, PolicyStatus, PolicyType, PolicyTypes } from '../../interfaces/policy.types';
 import { ControlpanelSuccessTransport } from '../../interfaces/controlpanel.types';
+import { Ric } from 'src/app/interfaces/ric';
 
 /**
  * Services for calling the policy endpoints.
@@ -108,8 +109,8 @@ export class PolicyService {
     }
 
 
-    getRics(policyTypeId: string): Observable<string[]> {
-        const url = this.buildPath('rics') + '?policyType=' + policyTypeId;
+    getRics(policyTypeId: string): Observable<Ric[]> {
+        const url = this.buildPath('rics') + '?policytype_id=' + policyTypeId;
         return this.httpClient.get<any>(url);
     }
 }