From b639c393acac65eb1c7b1bfc29b41bef92e2186d Mon Sep 17 00:00:00 2001 From: Bart Wensley Date: Wed, 11 Sep 2019 06:46:49 -0500 Subject: [PATCH] Remove Titanium/Wind River references from VIM webserver Also disabling the nfv devstack jobs. These jobs are failing after the recent repo restructuring due to failures in the FM devstack setup. The jobs can be re-enabled in the future (after the issues are fixed), if there is some value in doing so. Change-Id: Ib443edc76ca636c83331945de74d875ffb3592ac Story: 2004515 Task: 36579 Signed-off-by: Bart Wensley --- .zuul.yaml | 2 -- nfv/centos/build_srpm.data | 2 +- nfv/centos/nfv.spec | 2 +- nfv/nfv-vim/nfv_vim/webserver/_webserver.py | 3 +-- .../webserver/css/dashboard-sidebar.css | 1 - nfv/nfv-vim/nfv_vim/webserver/html/index.html | 10 ++++------ .../StarlingX_Icon_RGB_Stacked_2color.png | Bin 0 -> 10233 bytes .../webserver/images/windriver-favicon.ico | Bin 1406 -> 0 bytes .../webserver/images/windriver-helix.jpg | Bin 213497 -> 0 bytes .../webserver/images/windriver-red-med.png | Bin 1835 -> 0 bytes 10 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 nfv/nfv-vim/nfv_vim/webserver/images/StarlingX_Icon_RGB_Stacked_2color.png delete mode 100755 nfv/nfv-vim/nfv_vim/webserver/images/windriver-favicon.ico delete mode 100755 nfv/nfv-vim/nfv_vim/webserver/images/windriver-helix.jpg delete mode 100755 nfv/nfv-vim/nfv_vim/webserver/images/windriver-red-med.png diff --git a/.zuul.yaml b/.zuul.yaml index f7e04ed5..5165a59d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,7 +6,6 @@ - stx-release-notes-jobs check: jobs: - - flock-devstack-nfv - openstack-tox-linters - nfv-tox-pep8 - nfv-tox-py27 @@ -16,7 +15,6 @@ - nova-api-proxy-tox-pylint gate: jobs: - - flock-devstack-nfv - openstack-tox-linters - nfv-tox-pep8 - nfv-tox-py27 diff --git a/nfv/centos/build_srpm.data b/nfv/centos/build_srpm.data index f1381bce..a5a37dd4 100755 --- a/nfv/centos/build_srpm.data +++ b/nfv/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=75 +TIS_PATCH_VER=76 diff --git a/nfv/centos/nfv.spec b/nfv/centos/nfv.spec index 0444e05f..960136a1 100755 --- a/nfv/centos/nfv.spec +++ b/nfv/centos/nfv.spec @@ -15,7 +15,7 @@ BuildRequires: python2-pip BuildRequires: python2-wheel %description -Titanium Cloud Config Info +StarlingX Network Function Virtualization %define local_bindir /usr/bin/ %define pythonroot /usr/lib64/python2.7/site-packages diff --git a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py index c0034119..fd15e7f1 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py +++ b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py @@ -52,8 +52,7 @@ class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_header('Content-Type', 'text/html') self.end_headers() self.wfile.write(f.read()) - - elif self.path == '/windriver-favicon.ico': + elif self.path == '/StarlingX_Icon_RGB_Stacked_2color.png': with open(_webserver_src_dir + '/images' + self.path, 'r') as f: self.send_response(httplib.OK) self.send_header('Content-Type', 'image/x-icon') diff --git a/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css b/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css index b2c7ce79..fd9d8e75 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css +++ b/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css @@ -42,7 +42,6 @@ .sidebar .branding .brand a { float: none; - background: url('/images/windriver-red-med.png') top center no-repeat; text-indent: inherit; text-align: center; text-decoration: none; diff --git a/nfv/nfv-vim/nfv_vim/webserver/html/index.html b/nfv/nfv-vim/nfv_vim/webserver/html/index.html index 148beef4..182dc3bc 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/html/index.html +++ b/nfv/nfv-vim/nfv_vim/webserver/html/index.html @@ -13,8 +13,8 @@ SPDX-License-Identifier: Apache-2.0 - VIM - Titanium Cloud - + VIM - StarlingX + @@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0
- Help + Help

@@ -59,7 +59,7 @@ SPDX-License-Identifier: Apache-2.0