Merge pull request #222 from anapolg/master

Menu features and fixes

Dockerfile

@@ -23,5 +23,15 @@ COPY --from=0 /build/dist/ /usr/share/nginx/html
 # Set nginx configuration from app files
 COPY ./nginx-custom.conf /etc/nginx/conf.d/default.conf
 
+# Enable selected environment
+COPY src/config-sp.json /usr/share/nginx/html/
+COPY src/config-vnv.json /usr/share/nginx/html/
+COPY src/config.json /usr/share/nginx/html/
+COPY src/entrypoint.sh /
+
+
+ENV PLATFORM sp
+CMD ["/entrypoint.sh"]
+
 # Expose application port
 EXPOSE 4200

Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
                 sh 'git clone https://github.com/sonata-nfv/tng-devops.git'
                 dir(path: 'tng-devops') {
                     sh 'ansible-playbook roles/sp.yml -i environments -e "target=pre-int-sp component=portal"'
-                    sh 'ansible-playbook roles/sp.yml -i environments -e "target=pre-int-vnv component=portal"'
+                    sh 'ansible-playbook roles/vnv.yml -i environments -e "target=pre-int-vnv component=portal"'
                 }
             }      
         }

src/app/app.component.ts

@@ -32,8 +32,6 @@
 
 import { Component, ViewEncapsulation } from "@angular/core";
 
-import { environment } from "../environments/environment";
-
 @Component({
   selector: "app-root",
   templateUrl: "./app.component.html",

src/app/service-platform/runtime-policies/runtime-policies.component.scss

@@ -44,8 +44,8 @@ app-runtime-policies {
       to right,
       $basic-background-color 1%,
       $table-underline-color 1%,
-      $table-underline-color 91%,
-      $basic-background-color 91%,
+      $table-underline-color 88%,
+      $basic-background-color 88%,
       $basic-background-color 100%
     );
   }
@@ -67,23 +67,13 @@ app-runtime-policies {
     background-color: $primary-color-light;
   }
 
-  .mat-cell:nth-child(3),
-  .mat-header-cell:nth-child(3) {
-    width: 5%;
-  }
-
-  .mat-cell:nth-child(5),
-  .mat-header-cell:nth-child(5) {
+  .mat-cell:nth-child(6),
+  .mat-header-cell:nth-child(6) {
     width: 5%;
   }
 
   .mat-cell:nth-child(7),
   .mat-header-cell:nth-child(7) {
     width: 70px;
   }
-
-  .mat-cell:nth-child(8),
-  .mat-header-cell:nth-child(8) {
-    width: 25px;
-  }
 }

src/app/service-platform/service-platform.service.ts

@@ -785,7 +785,7 @@ export class ServicePlatformService {
           resolve();
         })
         .catch(err => {
-          if (err.status == 500) {
+          if (err.status == 500 || err.status == 504) {
             resolve();
           } else {
             reject("There was an error while trying to instantiate this slice");

src/app/service-platform/slices-instances-detail/slices-instances-detail.component.ts

@@ -13,6 +13,7 @@ import { CommonService } from "../../shared/services/common/common.service";
 })
 export class SlicesInstancesDetailComponent implements OnInit {
   loading: boolean;
+  uuid: string;
   detail = {};
 
   constructor(
@@ -25,6 +26,7 @@ export class SlicesInstancesDetailComponent implements OnInit {
 
   ngOnInit() {
     this.route.params.subscribe(params => {
+      this.uuid = params["id"];
       this.requestSliceInstance(params["id"]);
     });
   }
@@ -57,10 +59,13 @@ export class SlicesInstancesDetailComponent implements OnInit {
     let action = "Terminate";
 
     this.dialogData.openDialog(title, content, action, () => {
+      this.commonService.openSnackBar("Terminating instance...", "");
+
       this.servicePlatformService
         .postOneSliceInstanceTermination(this.detail["uuid"])
         .then(response => {
-          this.commonService.openSnackBar(response, "");
+          // this.commonService.openSnackBar(response, "");
+          // this.requestSliceInstance(this.uuid);
         })
         .catch(err => {
           this.commonService.openSnackBar(err, "");

src/app/service-platform/slices-instances/slices-instances.component.html

@@ -34,7 +34,7 @@ <h2 class="subsectionTitle">Slice Instances</h2>
     <th mat-header-cell *matHeaderCellDef>
     </th>
     <td mat-cell *matCellDef="let element" (click)="stopInstance(element)" (click)="$event.stopPropagation()">
-      <button *ngIf="element.state.toUpperCase() != 'TERMINATED' && element.state != 'ERROR'" class="actions"
+      <button *ngIf="element.state.toUpperCase() != 'TERMINATED' && element.state.toUpperCase() != 'ERROR'" class="actions"
         mat-button matTooltip="Terminate">
         <i class="wui wui-stop-alt"></i>
       </button>

src/app/service-platform/slices-instances/slices-instances.component.ts

@@ -79,11 +79,13 @@ export class SlicesInstancesComponent implements OnInit, OnDestroy {
       let action = "Terminate";
 
       this.dialogData.openDialog(title, content, action, () => {
+        this.commonService.openSnackBar("Terminating instance...", "");
+
         this.servicePlatformService
           .postOneSliceInstanceTermination(item.uuid)
           .then(response => {
-            this.commonService.openSnackBar(response, "");
-            this.requestInstances();
+            // this.commonService.openSnackBar(response, "");
+            // this.requestInstances();
           })
           .catch(err => {
             this.commonService.openSnackBar(err, "");

src/app/shared/directives/feature-available.directive.ts

@@ -1,19 +1,22 @@
 import { Directive, ElementRef, Input } from "@angular/core";
-import { environment } from "../../../environments/environment";
+import { ConfigService } from "../services/config/config.service";
 
 @Directive({
   selector: "[ifFeatureAvailable]"
 })
 export class FeatureAvailableDirective {
-  @Input("ifFeatureAvailable") service: string;
+  @Input("ifFeatureAvailable")
+  service: string;
   _element: ElementRef;
-  constructor(el: ElementRef) {
+  constructor(el: ElementRef, private configService: ConfigService) {
     this._element = el;
   }
 
   ngOnInit() {
     const isServiceAvailable =
-      environment.features_available.indexOf(this.service.toUpperCase()) > -1
+      this.configService.features_available.indexOf(
+        this.service.toUpperCase()
+      ) > -1
         ? true
         : false;
     if (!isServiceAvailable) {

src/app/shared/services/config/config.service.ts

@@ -1,7 +1,10 @@
 import { Injectable } from "@angular/core";
+import { HttpClient, HttpErrorResponse } from "@angular/common/http";
+
+import { Config } from "./config";
 
 @Injectable()
-export class ConfigService {
+export class ConfigService extends Config {
   baseSP: string = window.location.origin + "/api/v3/";
   baseVNV: string = window.location.origin + "/api/v3/";
   register: string = "users/";
@@ -27,12 +30,28 @@ export class ConfigService {
   runtimePoliciesDefault: string = "policies/default/";
   runtimePoliciesActions: string = "policies/actions";
 
-  constructor() {}
+  private configFile = "./config.json";
+
+  constructor(private http: HttpClient) {
+    super();
+  }
 
-  init() {
+  init(): Promise<Config> {
     if (window.location.origin.includes("localhost")) {
       this.baseSP = "http://pre-int-sp-ath.5gtango.eu:32002/api/v3/";
       this.baseVNV = "http://pre-int-vnv-bcn.5gtango.eu:32002/api/v3/";
     }
+
+    return new Promise<Config>((resolve, reject) => {
+      this.http.get(this.configFile).subscribe(
+        response => {
+          Object.assign(this, response as Config);
+          resolve(this);
+        },
+        (error: HttpErrorResponse) => {
+          reject(error.error);
+        }
+      );
+    });
   }
 }

src/app/shared/services/config/config.ts

@@ -0,0 +1,3 @@
+export class Config {
+  features_available: Array<string>;
+}

src/config-sp.json

@@ -0,0 +1,3 @@
+{
+  "features_available": ["DASHBOARD", "SERVICE PLATFORM", "SERVICE MANAGEMENT"]
+}

src/config-vnv.json

@@ -0,0 +1,3 @@
+{
+  "features_available": ["DASHBOARD", "VALIDATION"]
+}

src/config.json

@@ -0,0 +1,8 @@
+{
+  "features_available": [
+    "DASHBOARD",
+    "VALIDATION",
+    "SERVICE PLATFORM",
+    "SERVICE MANAGEMENT"
+  ]
+}

src/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+case $PLATFORM in
+"sp")
+mv /usr/share/nginx/html/config-sp.json /usr/share/nginx/html/config.json
+;;
+"vnv")
+mv /usr/share/nginx/html/config-vnv.json /usr/share/nginx/html/config.json 
+;;
+esac
+
+exec $(which nginx) -c /etc/nginx/nginx.conf -g "daemon off;"

src/environments/environment.prod.ts

@@ -1,9 +1,3 @@
 export const environment = {
-  production: true,
-  features_available: [
-    "DASHBOARD",
-    "VALIDATION",
-    "SERVICE PLATFORM",
-    "SERVICE MANAGEMENT"
-  ]
+  production: true
 };

src/environments/environment.ts

@@ -4,11 +4,5 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: false,
-  features_available: [
-    "DASHBOARD",
-    "VALIDATION",
-    "SERVICE PLATFORM",
-    "SERVICE MANAGEMENT"
-  ]
+  production: false
 };