From 304b20d88be84ca9d709b95e21cd0f7ea228be12 Mon Sep 17 00:00:00 2001
From: Sara Weiss <sara.weiss@intl.att.com>
Date: Mon, 16 Dec 2019 11:08:26 +0200
Subject: change serviceBase modal file name to InstantiationBase

Issue-ID: VID-724
Signed-off-by: Sara Weiss <sara.weiss@intl.att.com>
Change-Id: I69b0a7bb7d996204416475678d061a9f3c838c06
---
 .../instantiationStatus.component.service.ts                  |  2 +-
 .../instantiation.templates.row.model.ts                      |  2 +-
 vid-webpack-master/src/app/shared/models/InstantiationBase.ts | 11 +++++++++++
 vid-webpack-master/src/app/shared/models/serviceBase.ts       | 11 -----------
 .../src/app/shared/server/serviceInfo/serviceInfo.model.ts    |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 vid-webpack-master/src/app/shared/models/InstantiationBase.ts
 delete mode 100644 vid-webpack-master/src/app/shared/models/serviceBase.ts

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/InstantiationBase.ts b/vid-webpack-master/src/app/shared/models/InstantiationBase.ts
new file mode 100644
index 000000000..afa8a8136
--- /dev/null
+++ b/vid-webpack-master/src/app/shared/models/InstantiationBase.ts
@@ -0,0 +1,11 @@
+export class InstantiationBase {
+  readonly jobId: string;
+  readonly serviceModelId: string;
+
+  constructor(data?) {
+    if(data){
+      this.jobId = data.jobId;
+      this.serviceModelId = data.serviceModelId;
+    }
+  }
+}
diff --git a/vid-webpack-master/src/app/shared/models/serviceBase.ts b/vid-webpack-master/src/app/shared/models/serviceBase.ts
deleted file mode 100644
index afa8a8136..000000000
--- a/vid-webpack-master/src/app/shared/models/serviceBase.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export class InstantiationBase {
-  readonly jobId: string;
-  readonly serviceModelId: string;
-
-  constructor(data?) {
-    if(data){
-      this.jobId = data.jobId;
-      this.serviceModelId = data.serviceModelId;
-    }
-  }
-}
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;
-- 
cgit 1.2.3-korg