Commit 8fb8231f authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Update docs and point to new images

parent 281668bd

ansible/inventory/group_vars/all/srm.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ srm_nodeport: 32415 


# SRM image (i2cat registry)

srm_controller_image_repository: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/oop/service-resource-manager"

srm_controller_image_tag: "feature-srm-fm-integration-v7"

srm_controller_image_tag: "feature-srm-fm-integration-tfsdk-ce68542"



# SRM EdgeCloud adapter configuration

# Use kubernetes adapter

ansible/roles/federation-manager/defaults/main.yml

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ federation_manager_namespace: "federation-manager" 


# Kubeconfig

# K8s-distro-agnostic kubeconfig path

federation_manager_kubeconfig: "{{ kubeconfig_path | default(kubeconfig_dir ~ '/' ~ kubeconfig_filename) }}"

federation_manager_kubeconfig: "{{ kubeconfig_path | default(kubeconfig_output_dir ~ '/' ~ kubeconfig_filename) }}"



# ==========================================

# Federation Manager Image

# ==========================================

federation_manager_image: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/federation-manager/federation-manager-i2cat" #federation_manager_image: "labs.etsi.org:5050/oop/code/federation-manager/federation-manager"

federation_manager_tag: "feature-srm-fm-integration"

federation_manager_tag: "feature-srm-fm-integration-wip-f74aae0"

federation_manager_replicas: 1

federation_manager_container_port: 8989

federation_manager_nodeport: 30989

ansible/roles/srm/defaults/main.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ srm_controller_name: srmcontroller 
srm_controller_replicas: 1

# srm_controller_image_repository: "labs.etsi.org:5050/oop/code/service-resource-manager"

srm_controller_image_repository: "gitlab.i2cat.net:5050/areas/software-networks/operator-platform/oop/service-resource-manager"

srm_controller_image_tag: "feature-srm-fm-integration-v7"

srm_controller_image_tag: "feature-srm-fm-integration-tfsdk-ce68542"

srm_controller_image_pull_policy: Always

srm_image_pull_secret_enabled: true 

srm_image_pull_secret_name: "gitlab-registry-secret"

docs/deployment.md

+81 −13
Original line number Diff line number Diff line
@@ -10,6 +10,15 @@ Use this for real federation across two hosts. 
ansible-playbook playbooks/scenarios/dual_oop/deploy.yml --limit openop_2,openop_3

```



Validated kubernetes-adapter demo deployment:



```bash

ansible-playbook playbooks/scenarios/dual_oop/deploy.yml \

  --limit openop_2,openop_3 \

  -e oop_deployment_profile=kubernetes \

  -e srm_controller_image_tag=feature-srm-fm-integration-srmfix2-fb67c92

```



This deploys:



- OP1 on `op1_nodes`
@@ -65,31 +74,90 @@ Useful service URLs: 


After `dual_oop` is green, run smoke from `local-docker-deployment/` in repository root.



Command:

Validated full lifecycle smoke for real two-host kubernetes-adapter demo:



```bash

APP_ID=18909090-9090-4909-8909-189090909090 \

APP_NAME=federatednginxoci \

KEYCLOAK_TOKEN_URL=http://192.168.123.155:30082/realms/federation/protocol/openid-connect/token \

CLIENT_ID=originating-op-1 \

CLIENT_SECRET=dd7vNwFqjNpYwaghlEwMbw10g0klWDHb \

OEG_BASE_URL=http://192.168.123.155:32263/oeg/1.0.0 \

REMOTE_OEG_BASE_URL=http://192.168.123.178:32263/oeg/1.0.0 \

LOCAL_ZONE_ID=47056b13-494d-4e68-a7e7-88a783d69b1d \

LOCAL_ZONE_NAME=op1-control-plane \

FEDERATED_ZONE_ID=5460f101-e44c-4dae-b41b-cb7752aafced \

APP_PACKAGE_TYPE=CONTAINER \

APP_IMAGE_PATH=nginx:latest \

REUSE_FEDERATION_CONTEXT=false \

CLEANUP_FEDERATION=true \

bash ../local-docker-deployment/smoke-test.sh

```



Deploy-only variant for manual API E2E testing:



```bash

bash smoke-test.sh \

  --app-id "550e8400-e29b-41d4-a716-446655440777" \

  --image "docker.io/nginx:latest" \

  --app-name "test-app" \

  --local-url "http://192.168.123.155:32263/oeg/1.0.0" \

  --remote-url "http://192.168.123.178:32263/oeg/1.0.0" \

  --local-provider "Local Operator" \

  --federated-provider "Remote Operator"

APP_ID=18707070-7070-4707-8707-187070707070 \

APP_NAME=federatednginxoci \

KEYCLOAK_TOKEN_URL=http://192.168.123.155:30082/realms/federation/protocol/openid-connect/token \

CLIENT_ID=originating-op-1 \

CLIENT_SECRET=dd7vNwFqjNpYwaghlEwMbw10g0klWDHb \

OEG_BASE_URL=http://192.168.123.155:32263/oeg/1.0.0 \

REMOTE_OEG_BASE_URL=http://192.168.123.178:32263/oeg/1.0.0 \

LOCAL_ZONE_ID=47056b13-494d-4e68-a7e7-88a783d69b1d \

LOCAL_ZONE_NAME=op1-control-plane \

FEDERATED_ZONE_ID=5460f101-e44c-4dae-b41b-cb7752aafced \

APP_PACKAGE_TYPE=CONTAINER \

APP_IMAGE_PATH=nginx:latest \

REUSE_FEDERATION_CONTEXT=false \

CLEANUP_FEDERATION=false \

bash ../local-docker-deployment/smoke-test-deploy.sh

```



Cleanup after deploy-only demo:



```bash

APP_ID=18707070-7070-4707-8707-187070707070 \

APP_NAME=federatednginxoci \

KEYCLOAK_TOKEN_URL=http://192.168.123.155:30082/realms/federation/protocol/openid-connect/token \

CLIENT_ID=originating-op-1 \

CLIENT_SECRET=dd7vNwFqjNpYwaghlEwMbw10g0klWDHb \

OEG_BASE_URL=http://192.168.123.155:32263/oeg/1.0.0 \

REMOTE_OEG_BASE_URL=http://192.168.123.178:32263/oeg/1.0.0 \

LOCAL_ZONE_ID=47056b13-494d-4e68-a7e7-88a783d69b1d \

LOCAL_ZONE_NAME=op1-control-plane \

FEDERATED_ZONE_ID=5460f101-e44c-4dae-b41b-cb7752aafced \

APP_PACKAGE_TYPE=CONTAINER \

APP_IMAGE_PATH=nginx:latest \

REUSE_FEDERATION_CONTEXT=false \

CLEANUP_FEDERATION=true \

bash ../local-docker-deployment/smoke-test-undeploy.sh

```



Manual API E2E testing sequence:



1. Local deployment:

   use `MANUAL_E2E_WALKTHROUGH.md` section `6` with OP1 OEG URL `http://192.168.123.155:32263/oeg/1.0.0`, local zone `47056b13-494d-4e68-a7e7-88a783d69b1d`, `APP_PACKAGE_TYPE=CONTAINER`, `APP_IMAGE_PATH=nginx:latest`

2. Federation enablement:

   use section `7.1` to `7.4` against OP1 OEG

3. Federated deployment:

   use section `7.6` with remote zone `5460f101-e44c-4dae-b41b-cb7752aafced`

4. Verification:

   `curl -sS "$OEG_BASE_URL/appinstances?appId=<APP_ID>"`

5. Optional partner-side proof:

   `curl -sS "http://192.168.123.178:32415/srm/1.0.0/internal/fm/deployments/<APP_ID>/instances/<REMOTE_INSTANCE_ID>/zones/5460f101-e44c-4dae-b41b-cb7752aafced"`



Notes:



- use OEG northbound URL on port `32263`, not Federation Manager on `30989`

- current smoke script auto-resolves local and remote zone IDs

- current smoke script auto-normalizes invalid `appId`, app name, and app provider inputs to CAMARA-valid values

- current smoke script auto-normalizes invalid app names like `test-app` to `test_app`

- for kubernetes-adapter demo, use `APP_PACKAGE_TYPE=CONTAINER` and `APP_IMAGE_PATH=nginx:latest`

- current smoke script accepts both `ready` and `READY` when checking instance readiness

- script deploys and then cleans up app instances in one run



Expected success signals:



- local app instance reaches `ready`

- federated app instance reaches `ready`

- federated app instance reaches `ready` or `READY`

- cleanup leaves `Remaining matching app instances: []`



## Undeploy

docs/getting-started.md

+28 −0
Original line number Diff line number Diff line
@@ -69,6 +69,21 @@ Two-host federation setup: 
ansible-playbook playbooks/scenarios/dual_oop/deploy.yml --limit openop_2,openop_3

```



Validated kubernetes-adapter demo deployment:



```bash

ansible-playbook playbooks/scenarios/dual_oop/deploy.yml \

  --limit openop_2,openop_3 \

  -e oop_deployment_profile=kubernetes \

  -e srm_controller_image_tag=feature-srm-fm-integration-srmfix2-fb67c92

```



Current known-good image tags in workspace:



- SRM: `feature-srm-fm-integration-srmfix2-fb67c92`

- OEG: `feature-srm-fm-integration-a6aea77`

- FM: `feature-srm-fm-integration-wip-f74aae0`



Single-host complete platform:



```bash
@@ -91,6 +106,19 @@ kubectl get nodes 
kubectl get pods -A

```



Useful demo endpoints after `dual_oop` deploy:



- OP1 OEG: `http://192.168.123.155:32263/oeg/1.0.0`

- OP2 OEG: `http://192.168.123.178:32263/oeg/1.0.0`

- OP1 SRM: `http://192.168.123.155:32415/srm/1.0.0`

- OP2 SRM: `http://192.168.123.178:32415/srm/1.0.0`

- Keycloak token endpoint: `http://192.168.123.155:30082/realms/federation/protocol/openid-connect/token`



Useful demo zone ids:



- OP1 local zone: `47056b13-494d-4e68-a7e7-88a783d69b1d`

- OP2 local zone: `5460f101-e44c-4dae-b41b-cb7752aafced`



## 7. Undeploy



Quick removal: