X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Finterceptor.mock.ts;h=844513bc206d2b2a1b4a335c0f3ac9d7da4e5c82;hb=d3ff005fd067a0a8b1c467f95713362716de3f1c;hp=b0603c9341939e6695925a2e5c3dcba9e1fde14f;hpb=b43fe9cc63931f8c45f93261f235d0608a855a83;p=portal%2Fnonrtric-controlpanel.git diff --git a/webapp-frontend/src/app/interceptor.mock.ts b/webapp-frontend/src/app/interceptor.mock.ts index b0603c9..844513b 100644 --- a/webapp-frontend/src/app/interceptor.mock.ts +++ b/webapp-frontend/src/app/interceptor.mock.ts @@ -19,6 +19,7 @@ */ import { + HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, @@ -26,7 +27,7 @@ import { HttpResponse, } from "@angular/common/http"; import { Injectable, Injector } from "@angular/core"; -import { Observable, of } from "rxjs"; +import { Observable, of, throwError } from "rxjs"; import * as policyinstance1 from "./mock/policy-instance-1.json"; import * as noTypePolicies from "./mock/no-type-policies.json"; import * as type0Policies from "./mock/type0-policies.json"; @@ -35,23 +36,31 @@ import * as policyinstance2 from "./mock/policy-instance-2.json"; import * as noTypePolicyinstance from "./mock/policy-instance-notype.json"; import * as policyinstance1Status from "./mock/policy-instance-1-status.json"; import * as policyinstance2Status from "./mock/policy-instance-2-status.json"; -import * as jobsProd1 from "./mock/jobs-producer1.json"; -import * as jobsProd2 from "./mock/jobs-producer2.json"; import * as producerIds from "./mock/producerids.json"; import * as producer1 from "./mock/producer1.json"; import * as producer2 from "./mock/producer2.json"; +import * as producer3 from "./mock/producer3.json"; import * as producerstatus1 from "./mock/producer-status1.json"; import * as producerstatus2 from "./mock/producer-status2.json"; +import * as producerstatus3 from "./mock/producer-status3.json"; import * as policytypes1 from "./mock/policy-type1.json"; import * as policytypes0 from "./mock/policy-type0.json"; import * as policyinstanceedit from "./mock/policy-instance-edit.json"; import * as ric1 from "./mock/ric1.json"; import * as ric2 from "./mock/ric2.json"; import * as ricconfig from "./mock/ric-configuration.json"; +import * as jobIds from "./mock/jobids.json"; +import * as infoJob1 from "./mock/info-job1.json"; +import * as infoJob2 from "./mock/info-job2.json"; +import * as infoJob3 from "./mock/info-job3.json"; +import * as job1Status from "./mock/job1-status.json"; +import * as job2Status from "./mock/job2-status.json"; +import * as job3Status from "./mock/job3-status.json"; import { delay } from "rxjs/operators"; const POLICY_PATH = "/a1-policy/v2" const INFO_PATH = "/data-producer/v1" +const CONSUMER_PATH = "/data-consumer/v1" const urls = [ { @@ -142,6 +151,10 @@ const urls = [ url: INFO_PATH + "/info-producers/producer2", json: producer2, }, + { + url: INFO_PATH + "/info-producers/producer3", + json: producer3, + }, { url: INFO_PATH + "/info-producers/producer1/status", json: producerstatus1, @@ -151,12 +164,36 @@ const urls = [ json: producerstatus2, }, { - url: INFO_PATH + "/info-producers/producer1/info-jobs", - json: jobsProd1, + url: INFO_PATH + "/info-producers/producer3/status", + json: producerstatus3, + }, + { + url: CONSUMER_PATH + "/info-jobs", + json: jobIds, + }, + { + url: CONSUMER_PATH + "/info-jobs/job1", + json: infoJob1, + }, + { + url: CONSUMER_PATH + "/info-jobs/job2", + json: infoJob2, }, { - url: INFO_PATH + "/info-producers/producer2/info-jobs", - json: jobsProd2, + url: CONSUMER_PATH + "/info-jobs/job3", + json: infoJob3, + }, + { + url: CONSUMER_PATH + "/info-jobs/job1/status", + json: job1Status, + }, + { + url: CONSUMER_PATH + "/info-jobs/job2/status", + json: job2Status, + }, + { + url: CONSUMER_PATH + "/info-jobs/job3/status", + json: job3Status, }, { url: '/a1-policy/v2/configuration', @@ -192,7 +229,7 @@ export class HttpMockRequestInterceptor implements HttpInterceptor { } } - if (result) { + if (result) { console.log( "Mock answering http call :" + request.method + " " + request.url, request.method === "PUT" ? request.body : null @@ -222,4 +259,5 @@ export class HttpMockRequestInterceptor implements HttpInterceptor { } return result; } + }