Commit 4001779d authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2026Q2_RC' into 'develop' 

Merging RC branch to develop

See merge request !72
parents a04e1e73 8c631fec

compose/deploy.sh

+1 −0
Changes for compose/deploy.sh: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ updaterepo org.etsi.osl.tmf.api 
updaterepo org.etsi.osl.cridge

updaterepo org.etsi.osl.metrico

updaterepo org.etsi.osl.mcp.server

updaterepo org.etsi.osl.mcp.backend



updaterepo org.etsi.osl.tmf.web

updaterepo org.etsi.osl.portal.web

compose/docker-compose.yaml.configure

+11 −11
Changes for compose/docker-compose.yaml.configure: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.portal.api/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.portal.api:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -153,7 +153,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.mano/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mano:latest

    environment:

       SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -179,7 +179,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.bugzilla/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.bugzilla:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -210,7 +210,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.tmf.api/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.tmf.api:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -258,7 +258,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.osom/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.osom:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url" : "jdbc:h2:/tmp/tempdb;DB_CLOSE_DELAY=-1",
@@ -290,7 +290,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.oas/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.oas:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "origins": "http://localhost",
@@ -332,7 +332,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.cridge/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.cridge:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",
@@ -361,7 +361,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.metrico/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.metrico:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url": "jdbc:mysql://amysql/metricodb?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC",
@@ -392,7 +392,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.mcp.server/

        dockerfile: Dockerfile      

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.server:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.datasource.url": "jdbc:mysql://amysql/osdb?createDatabaseIfNotExist=true",
@@ -431,7 +431,7 @@ services: 
    build:

      context: ../../org.etsi.osl.mcp.backend/

      dockerfile: Dockerfile

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.backend:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.mcp.backend:latest

    ports:

      - "11880:11880"

    environment:
@@ -502,7 +502,7 @@ services: 
    build:

        context:  ../../org.etsi.osl.centrallog.service/

        dockerfile: Dockerfile        

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:develop

    image: labs.etsi.org:5050/osl/code/org.etsi.osl.centrallog.service:latest

    environment:

      SPRING_APPLICATION_JSON: '{

        "spring.activemq.brokerUrl": "tcp://anartemis:61616?jms.watchTopicAdvisories=false",

compose/docker-images-build.sh

deleted100644 → 0
+0 −29
Changes for compose/docker-images-build.sh: 0 added lines, 29 removed lines.
Original line number Diff line number Diff line 
#!/bin/sh



dirlocation=`pwd`/.

echo "We're working with $dirlocation"

cd $dirlocation

tagname=latest



buildimg(){

        cd $dirlocation/$1

        echo "Build " $1

        sudo docker build -t openslice/$1:$tagname -f $2 .

        sudo docker push  openslice/$1:$tagname

}



buildimg org.etsi.osl.centrallog.service Dockerfile.centrallog

buildimg org.etsi.osl.portal.api Dockerfile.portalapi

buildimg org.etsi.osl.mano Dockerfile.mano

buildimg org.etsi.osl.bugzilla Dockerfile.bugzilla

buildimg org.etsi.osl.osom Dockerfile.osom

buildimg org.etsi.osl.portal.web Dockerfile

buildimg org.etsi.osl.tmf.api Dockerfile.tmfapi

buildimg org.etsi.osl.oas Dockerfile.oasapi







cd $dirlocation/org.etsi.osl.tmf.web

docker run -u 0 --rm -v "$PWD":/app trion/ng-cli npm install

docker run -u 0 --rm -v "$PWD":/app trion/ng-cli ng build --prod --deleteOutputPath=false

buildimg org.etsi.osl.tmf.web Dockerfile
 
 No newline at end of file

compose/readme_old.txt

deleted100644 → 0
+0 −109
Changes for compose/readme_old.txt: 0 added lines, 109 removed lines.
Original line number Diff line number Diff line 
backend API Development



nginx.conf:

- comment location /osapi

- comment location /tmf-api

- comment location /oas-api



fix auth location in nginx.conf as follows:



        location /auth {

                proxy_pass http://keycloak:8080/auth;

                        proxy_set_header  X-Real-IP $remote_addr;

                        proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;

                        proxy_set_header  Host $http_host;

        }





docker-compose --profile dev down;docker-compose --profile dev up -d 



Keycloak for development





Add 127.0.0.1 keycloak in your hosts file and replace http://localhost/auth/ with http://keycloak:8080/auth/ in your Keycloak config for TypeScript/Angular.



Hosts File Location:



In Linux/Unix, its location is at: /etc/hosts In windows, its location is at c:\Windows\System32\Drivers\etc\hosts.



Explanation:



    The Nginx uses the http://keycloak:8080 URL which is the network inside the docker system.

    The front-end (TS/Angular) uses the http://keycloak:8080

    You will not get the invalid token error, as you are getting the token from http://keycloak:8080 and as well verifying with the same URL.







nginx serves already the frontend from the project org.etsi.osl.tmf.web









If you would like to use the frontend to test your backend config.prod.json should look similar to the following example





{

    "TITLE": "Openslice demo",

    "PORTALVERSION":"1.1.0-SNAPSHOT",

    "WIKI": "http://wiki.localhost",

    "BUGZILLA": "{BASEURL}/bugzilla/",

    "STATUS": "http://status.localhost/",

    "WEBURL": "{BASEURL}",

    "PORTAL_REPO_APIURL": "{BASEURL}/osapi",

    "ASSURANCE_SERVICE_MGMT_APIURL": "{BASEURL}/oas-api",

    "APITMFURL": "http://localhost:13082/tmf-api",

    "OAUTH_CONFIG" : {

        "issuer": "http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/auth",

        "loginUrl": "http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/auth",

        "tokenEndpoint": "http://keycloak:8080/auth/realms/openslice/protocol/openid-connect/token",

        "redirectUri": "{BASEURL}/redirect",

        "logoutUrl": "{BASEURL}/auth/realms/openslice/protocol/openid-connect/logout",

        "postLogoutRedirectUri": "{BASEURL}/services/services_marketplace",



        "responseType": "code",

        "oidc": false,

        "clientId": "osapiWebClientId",

        "dummyClientSecret": "secret",



        "requireHttps": false,

        "useHttpBasicAuth": true,

        "clearHashAfterLogin": false,



        "showDebugInformation": true

    }

}







for the NFV frontend, config.js should be like the following:



var appConfig = angular.module('portalwebapp.config',[]);





appConfig.factory('APIEndPointService', function() {

	  return {	      

		TITLE: "Openslice",

		WIKI: "ROOTURL",

		BUGZILLA: "ROOTURL/bugzilla/",

		STATUS: "ROOTURL/status/",

		APIURL: "http://localhost:13000",

		WEBURL: "ROOTURL/nfvportal",

		APIOAUTHURL: "http://keycloak:8080/auth/realms/openslice",

		APITMFURL: "http://localhost:13082/tmf-api/serviceCatalogManagement/v4"

		

	  };

});





    

    

    

--- 



Run openslice on host



Build first



docker-compose --profile prod down;docker-compose --profile prod  up -d --build



    
 No newline at end of file

kubernetes/helm/openslice/Chart.yaml

+2 −2
Changes for kubernetes/helm/openslice/Chart.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ type: application 
# This is the chart version. This version number should be incremented each time you make changes

# to the chart and its templates, including the app version.

# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 4.0.0

version: 4.1.0



# This is the version number of the application being deployed. This version number should be

# incremented each time you make changes to the application. Versions are not expected to

# follow Semantic Versioning. They should reflect the version the application is using.

appVersion: 2026Q2-SNAPSHOT
 
appVersion: 2026Q2