Align changes to Amsterdam

Change-Id: I87f6503aac4c85aeb2d967a57387fc7f0cc140a8
Issue-ID: VID-97
Signed-off-by: Ofir Sonsino <os0695@att.com>

45 files changed, 68 insertions, 14 deletions

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 7c054a651..a4f39fdd6 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,31 +1,84 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 
-Release Notes
-=============
+VID Release Notes
+=================
 
-Version: 1.1.0
+Version: 1.1.1
 --------------
 
-
 :Release Date: 2017-11-16
 
-
-
-**New Features**
+New Features
+------------
 
 1. Improved TOSCA parser.
 2. Change Management - Provides the Operators a single tool for installing and maintaining the services as a self service activity. Provides the ability to schedule and execute change management workflows, Maintenance activities for vNFs that are already installed .
-3. PNF - PNFs are already installed on the edges of the cloud. In order to configure the PNF, the service needs to be connected to the PNF.
+3. PNF Instantiation - PNFs are already installed on the edges of the cloud. In order to configure the PNF, the service needs to be connected to the PNF.
+
+**Epics**
+
+-  [`VID-25`_] - Role management: Global Read only role
+-  [`VID-26`_] - Role management: Support VID specific Roles
+-  [`VID-27`_] - Change management: Schedule workflow
+-  [`VID-28`_] - Change management: Status of workflow
+-  [`VID-29`_] - Change management: Manual intervention
+-  [`VID-30`_] - PNF instantiation: Trigger PNF service information to SO
+-  [`VID-31`_] - PNF Instantiation: support service type PNF & display new fields
+
+.. _VID-25: https://jira.onap.org/browse/VID-25
+.. _VID-26: https://jira.onap.org/browse/VID-26
+.. _VID-27: https://jira.onap.org/browse/VID-27
+.. _VID-28: https://jira.onap.org/browse/VID-28
+.. _VID-29: https://jira.onap.org/browse/VID-29
+.. _VID-30: https://jira.onap.org/browse/VID-30
+.. _VID-31: https://jira.onap.org/browse/VID-31
+
+**Stories**
+
+-  [`VID-44`_] - Implement change management phase 1
+-  [`VID-48`_] - Change management: Schedule workflow
+-  [`VID-49`_] - Change management: Status of workflow
+-  [`VID-50`_] - Change management: Manual intervention
+-  [`VID-51`_] - Trigger PNF service information to MSO
+-  [`VID-52`_] - support service type PNF & display new fields
+
+.. _VID-44: https://jira.onap.org/browse/VID-44
+.. _VID-48: https://jira.onap.org/browse/VID-48
+.. _VID-49: https://jira.onap.org/browse/VID-49
+.. _VID-50: https://jira.onap.org/browse/VID-50
+.. _VID-51: https://jira.onap.org/browse/VID-51
+.. _VID-52: https://jira.onap.org/browse/VID-52
+
+
+Bug Fixes
+----------
+
+-  [`VID-20`_] - Failed to get service models from ASDC in VID
+-  [`VID-59`_] - VID Fails Robot Health Check
+-  [`VID-62`_] - VID healthcheck failure in RS ORD ONAP 1.1.0
+-  [`VID-64`_] - Got 500 from role/user API call
+-  [`VID-79`_] - Not able to create service instance using VID portal
+-  [`VID-82`_] - Create VF module with SDNC preload is throwing
+   exception
+
+.. _VID-20: https://jira.onap.org/browse/VID-20
+.. _VID-59: https://jira.onap.org/browse/VID-59
+.. _VID-62: https://jira.onap.org/browse/VID-62
+.. _VID-64: https://jira.onap.org/browse/VID-64
+.. _VID-79: https://jira.onap.org/browse/VID-79
+.. _VID-82: https://jira.onap.org/browse/VID-82
 
 
 **Known Issues**
-	- `VID-78 <https://jira.onap.org/browse/VID-78>`_ 
-	  VID shows the HTML code output whenever the customer list is empty (Cosmetic)
+
+- `VID-78 <https://jira.onap.org/browse/VID-78>`_ VID shows the HTML code output whenever the customer list is empty (Cosmetic)
 
 **Upgrade Notes**
+
 A scheduler is needed for the change management feature to work (not included in the Amsterdam release).
 
 **Other**
+
 In order to work properly, VID needs a working instance of SDC, A&AI and SO.
 
 ===========
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.eot
deleted file mode 100755
index d806cafe0..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.ttf
deleted file mode 100755
index 7b929a19e..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.woff
deleted file mode 100755
index 9cfc8d704..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-light-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.eot
deleted file mode 100755
index accbff933..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.ttf
deleted file mode 100755
index 7f80d56e2..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.woff
deleted file mode 100755
index 8f4a1d0a0..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-lightitalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.eot
deleted file mode 100755
index 01c2aa72f..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.ttf
deleted file mode 100755
index ac885f1b5..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.woff
deleted file mode 100755
index ade2ce37d..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-medium-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.eot
deleted file mode 100755
index 728c13445..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.ttf
deleted file mode 100755
index 6716cc103..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.woff
deleted file mode 100755
index d47febda5..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-mediumitalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.eot
deleted file mode 100755
index 9d9fe7596..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.ttf
deleted file mode 100755
index 93255498a..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.woff
deleted file mode 100755
index 027f47669..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regular-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.eot
deleted file mode 100755
index 3f6c44a40..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.ttf
deleted file mode 100755
index 0e5f0ca0d..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.woff
deleted file mode 100755
index 7be050652..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt/omnesatt-regularitalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.eot
deleted file mode 100755
index 0e5892d1e..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.ttf
deleted file mode 100755
index 94934087b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.woff
deleted file mode 100755
index 1dfd28f29..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bold-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.eot
deleted file mode 100755
index da1c1d1eb..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.ttf
deleted file mode 100755
index 4f35e1f9b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.woff
deleted file mode 100755
index 1722dce99..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-bolditalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.eot
deleted file mode 100755
index 280d111fe..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.ttf
deleted file mode 100755
index 273761ab3..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.woff
deleted file mode 100755
index b12120a86..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-light-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.eot
deleted file mode 100755
index 2da6a99ec..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.ttf
deleted file mode 100755
index 5153cee68..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.woff
deleted file mode 100755
index cf9993a1d..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-lightitalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.eot
deleted file mode 100755
index 37c715f5b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.ttf
deleted file mode 100755
index 274042541..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.woff
deleted file mode 100755
index 5cff69add..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-medium-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.eot
deleted file mode 100755
index 84ba4acc6..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.ttf
deleted file mode 100755
index 46bfd531b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.woff
deleted file mode 100755
index 20419ed3b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-mediumitalic-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.eot
deleted file mode 100755
index 39e1eae7c..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.ttf
deleted file mode 100755
index 2342be4be..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.woff
deleted file mode 100755
index 0acf1f027..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regular-webfont.woff
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.eot b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.eot
deleted file mode 100755
index 8723e66fa..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.eot
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.ttf b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.ttf
deleted file mode 100755
index 4ef76763b..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.ttf
+++ /dev/null
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.woff b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.woff
deleted file mode 100755
index 750d90d38..000000000
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/sandbox/styles/omnesatt2/omnesatt2-regularitalic-webfont.woff
+++ /dev/null
diff --git a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
index 9a064b000..451b19de7 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/controller/MsoController.java
@@ -405,7 +405,7 @@ public class MsoController extends RestrictedBaseController {
 

         MsoBusinessLogic mbl = new MsoBusinessLogic();

 

-        MsoResponseWrapper w = mbl.deleteVfModule(mso_request, serviceInstanceId, vnfInstanceId);

+        MsoResponseWrapper w = mbl.deleteVfModule(mso_request, serviceInstanceId, vnfInstanceId, vfModuleId);

 

         // always return OK, the MSO status code is embedded in the body

         return (new ResponseEntity<String>(w.getResponse(), HttpStatus.OK));

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java
index cd6003ad4..f6847e45d 100644
--- a/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/mso/MsoBusinessLogic.java
@@ -153,7 +153,7 @@ public class MsoBusinessLogic {
         return msoClientInterface.deleteVnf(requestDetails, vnf_endpoint);
     }
 
-    public MsoResponseWrapper deleteVfModule(RequestDetails requestDetails, String serviceInstanceId, String vnfInstanceId) throws Exception{
+    public MsoResponseWrapper deleteVfModule(RequestDetails requestDetails, String serviceInstanceId, String vnfInstanceId, String vfModuleId) throws Exception{
         String methodName = "deleteVfModule";
         logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " start");
 
@@ -164,8 +164,9 @@ public class MsoBusinessLogic {
             throw exception;
         }
 
-        String svc_endpoint = endpoint.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId);
-        String delete_vf_endpoint = svc_endpoint.replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
+        String vf__modules_endpoint = endpoint.replaceFirst(SVC_INSTANCE_ID, serviceInstanceId).replaceFirst(VNF_INSTANCE_ID, vnfInstanceId);
+
+        String delete_vf_endpoint = vf__modules_endpoint + '/' + vfModuleId;
 
         return msoClientInterface.deleteVfModule(requestDetails, delete_vf_endpoint);
     }