syncing

README.md

@@ -1,9 +1,15 @@
 # nfv-lab
 Repository for NFV lab with OSM MANO.
 It contains a helm-repository, check out the [index.yaml](index.yaml)
-
+
+## Acknowledgements
+
+This work is a result of project [ECTICS](https://www.dit.upm.es/~giros/project/ectics/) (PID2019-105257RB-C21), funded by:
+
+![financing-logo](doc/img/MICIU_AEI_w400.jpg)
+
 ## Scenario
-![scenario detail](doc/img/nfv-lab-figura4.drawio.png)
+![scenario detail](doc/en/img/nfv-lab-figura4.drawio.png)
 
 ## Quick testing guide
 1. Launch the machines RDSV-OSM and RDSV-K8S

bin/get-osmlab-k8s

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OVAFILE='RDSV2022-K8S-v4.ova'
+OVAFILE='RDSV-K8S-2024-v1.ova'
 LABDIR=/lab/rdsv/repo
 VMNAME='RDSV-K8S'
 STARTCMD="vboxmanage startvm $VMNAME"

bin/rdsv-config-osmlab

@@ -15,17 +15,17 @@ sed -i -e '/OSM_USER/d' \
        ~/.bashrc
 
 echo "export OSM_USER=rdsv$SCEN" >> ~/.bashrc
-echo "export OSM_PASSWORD=xxxx$SCEN" >> ~/.bashrc
+echo "export OSM_PASSWORD=Xxxxx1-$SCEN" >> ~/.bashrc
 echo "export OSM_PROJECT=rpry$SCEN" >> ~/.bashrc
 
-echo "export OSM_HOSTNAME=10.11.13.1" >> ~/.bashrc
+echo "export OSM_HOSTNAME=vosm-nbi.dit.upm.es" >> ~/.bashrc
 echo "alias kubectl='microk8s kubectl'" >> ~/.bashrc
 
 #source ~/.bashrc 
 export OSM_USER=rdsv$SCEN
-export OSM_PASSWORD=xxxx$SCEN
+export OSM_PASSWORD=Xxxxx1-$SCEN
 export OSM_PROJECT=rpry$SCEN
-export OSM_HOSTNAME=10.11.13.1
+export OSM_HOSTNAME=vosm-nbi.dit.upm.es
 
 echo "-- "
 echo "-- Script for preparing the enviroment for OSM laboratory "

doc/en/RDSV-p4.md

@@ -154,12 +154,12 @@ cd nfv-lab
 Install the tunnel to the OSM server via:
 
 ```
-cd ~/shared/sdedge-ns/bin
+cd ~/shared/nfv-lab/bin
 ./rdsv-start-tun <letra>  # If accessing from the DIT-UPM lab
 ```
 
 ```
-cd ~/shared/sdedge-ns/bin
+cd ~/shared/nfv-lab/bin
 ./rdsv-start-tun <letra> labtun5.dit.upm.es  # If accessing from your own PC
 ```
 
@@ -204,7 +204,7 @@ From the _host PC_, access the _OSM_ GUI via http://osm.dit.upm.es.
 Check that you can also access from the virtual machine via:
 
 ```
-# Acceso desde la máquina virtual
+# Access from the VM
 firefox 10.11.13.1 &
 ```