From: Alexandre Huff <alexandrehuff@utfpr.edu.br>
Date: Tue, 15 Feb 2022 21:20:10 +0000 (-0300)
Subject: Enable IP address for the container registry in the xApp descriptor file
X-Git-Tag: 0.5.5~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=be6039c35840ab4597c1b177ad59005439ae371d;p=ric-plt%2Fappmgr.git

Enable IP address for the container registry in the xApp descriptor file

Currently, appmgr does not allow onboarding xApp images that are
available in image registries pointed by IP addresses.
This change enables setting up an IPv4 address for the container
registry in the xApp descriptor file.

Issue-ID: RIC-884

Signed-off-by: Alexandre Huff <alexandrehuff@utfpr.edu.br>
Change-Id: Ie214cb460e791557333fe16d01848993c1f6b546
---

diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/helm_controller/xapp_schema.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/helm_controller/xapp_schema.py
index f3f15b0..396f0bd 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/helm_controller/xapp_schema.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/helm_controller/xapp_schema.py
@@ -95,7 +95,7 @@ schema = {
                                 "examples": [
                                     "nexus3.o-ran-sc.org:10002"
                                 ],
-                                "pattern": "^[A-Za-z0-9\\.-]{1,}\\.[A-Za-z]{1,}(?:\\:\\d+)?$"
+                                "pattern": "^([A-Za-z0-9\\.-]{1,}\\.[A-Za-z]{1,}|((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))(?:\\:\\d+)?$"
                             },
                             "name": {
                                 "$id": "#/properties/containers/items/properties/image/properties/name",