summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-12-16 12:39:46 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-16 12:39:46 +0000
commitf279146ffd395d446a58be75d6786de41b6a9381 (patch)
treeb6e1a53fc25d210e23769c3cf6b731ecfd2ca16a
parent79778d1483d96ca9177606c81a39feccdeda9290 (diff)
parent304b20d88be84ca9d709b95e21cd0f7ea228be12 (diff)
Merge "change serviceBase modal file name to InstantiationBase"
-rw-r--r--vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts2
-rw-r--r--vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts2
-rw-r--r--vid-webpack-master/src/app/shared/models/InstantiationBase.ts (renamed from vid-webpack-master/src/app/shared/models/serviceBase.ts)0
-rw-r--r--vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts2
4 files changed, 3 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
index 229beb443..3c45632ee 100644
--- a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
+++ b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
@@ -13,7 +13,7 @@ import {Router, UrlTree} from "@angular/router";
import {of} from "rxjs";
import {MsoService} from "../shared/services/msoService/mso.service";
import {ServiceAction} from "../shared/models/serviceInstanceActions";
-import {InstantiationBase} from "../shared/models/serviceBase";
+import {InstantiationBase} from "../shared/models/InstantiationBase";
export let PENDING : string = "pending";
export let INPROGRESS : string = "in_progress";
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
index f4609ee35..e68c34b85 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
@@ -1,6 +1,6 @@
import * as moment from 'moment';
import * as _ from 'lodash';
-import {InstantiationBase} from "../../../models/serviceBase";
+import {InstantiationBase} from "../../../models/InstantiationBase";
export class InstantiationTemplatesRowModel extends InstantiationBase{
readonly userId ?: string;
diff --git a/vid-webpack-master/src/app/shared/models/serviceBase.ts b/vid-webpack-master/src/app/shared/models/InstantiationBase.ts
index afa8a8136..afa8a8136 100644
--- a/vid-webpack-master/src/app/shared/models/serviceBase.ts
+++ b/vid-webpack-master/src/app/shared/models/InstantiationBase.ts
diff --git a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
index fa26a61a6..5a2b37a7d 100644
--- a/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
+++ b/vid-webpack-master/src/app/shared/server/serviceInfo/serviceInfo.model.ts
@@ -1,6 +1,6 @@
import {ServiceStatus} from '../../../instantiationStatus/instantiationStatus.component.service';
import {ServiceAction} from "../../models/serviceInstanceActions";
-import {InstantiationBase} from "../../models/serviceBase";
+import {InstantiationBase} from "../../models/InstantiationBase";
export class ServiceInfoModel extends InstantiationBase{
id: number;