From 0fd7875b5673d8d9b56c73adff2c8368d95e825b Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 1 Dec 2021 18:41:21 +0100 Subject: [PATCH] A1Sim changes to make it more flexible -A1Sim chart rework to be more flexible (that is required for the automation usecases) - Fix chartmuseum setup script - Update of the example override files to reduce ONAP footprint Issue-ID: NONRTRIC-609 Signed-off-by: sebdet Change-Id: Idfe7fc29384b73c0c359ff90e8f4013317b0c774 --- smo-install/helm-override/onap-override-cnf.yaml | 176 ++++++++++++--------- smo-install/helm-override/onap-override.yaml | 5 + smo-install/helm-override/oran-override.yaml | 11 ++ smo-install/oran_oom/a1simulator/Chart.yaml | 18 +-- .../a1simulator/templates/configmapenv.yaml | 15 ++ .../oran_oom/a1simulator/templates/deployment.yaml | 36 +++++ .../oran_oom/a1simulator/templates/service.yaml | 52 ++---- .../a1simulator/templates/statefulset.yaml | 172 -------------------- smo-install/oran_oom/a1simulator/values.yaml | 68 +++----- smo-install/oran_oom/nonrtric/requirements.yaml | 2 +- .../scripts/layer-0/0-setup-charts-museum.sh | 9 +- smo-install/scripts/layer-0/0-setup-tests-env.sh | 32 ++++ 12 files changed, 248 insertions(+), 348 deletions(-) create mode 100644 smo-install/oran_oom/a1simulator/templates/configmapenv.yaml create mode 100644 smo-install/oran_oom/a1simulator/templates/deployment.yaml delete mode 100644 smo-install/oran_oom/a1simulator/templates/statefulset.yaml create mode 100755 smo-install/scripts/layer-0/0-setup-tests-env.sh diff --git a/smo-install/helm-override/onap-override-cnf.yaml b/smo-install/helm-override/onap-override-cnf.yaml index 9f2f6e80..d989e06f 100644 --- a/smo-install/helm-override/onap-override-cnf.yaml +++ b/smo-install/helm-override/onap-override-cnf.yaml @@ -57,6 +57,45 @@ global: # Enable/disable and configure helm charts (ie. applications) # to customize the ONAP deployment. ################################################################# +a1policymanagement: + enabled: true + rics: + - name: ric1 + link: http://a1-sim-osc-0.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 + - name: ric2 + link: http://a1-sim-osc-1.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 + - name: ric3 + link: http://a1-sim-std-0.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 + - name: ric4 + link: http://a1-sim-std-1.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 + - name: ric5 + link: http://a1-sim-std2-0.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 + - name: ric6 + link: http://a1-sim-std2-1.a1-sim.nonrtric:8085 + controller: controller1 + managedElementIds: + - kista_1 + - kista_2 aaf: enabled: true aaf-service: @@ -68,10 +107,10 @@ aai: global: flavorOverride: unlimited cassandra: - replicas: 3 + replicas: 1 aai-cassandra: flavorOverride: unlimited - replicaCount: 3 + replicaCount: 1 aai-babel: flavorOverride: unlimited aai-data-router: @@ -100,7 +139,7 @@ appc: enabled: false cassandra: enabled: true - replicaCount: 3 + replicaCount: 1 config: cluster_domain: cluster.local heap: @@ -126,15 +165,20 @@ cds: enabled: true cli: enabled: false -consul: - enabled: false contrib: enabled: true awx: enabled: false netbox: enabled: true -dcaegen2: +consul: + enabled: true + consul-server: + replicaCount: 1 +cps: + enabled: false + +dcaegen2: enabled: true dcae-bootstrap: enabled: false @@ -156,7 +200,7 @@ dcaegen2: enabled: false dcae-ves-openapi-manager: enabled: false -dcaegen2-services: +dcaegen2-services: enabled: true dcae-bbs-eventprocessor-ms: enabled: false @@ -196,15 +240,16 @@ dcaegen2-services: enabled: true dcae-ves-mapper: enabled: false -dcaemod: - enabled: false -holmes: - enabled: false -dmaap: +dcaemod: + enabled: false +holmes: + enabled: false +dmaap: enabled: true message-router: message-router-zookeeper: replicaCount: 1 + zookeeperServers: 1 message-router-kafka: zookeeper: replicaCount: 1 @@ -215,11 +260,9 @@ dmaap: "log.dirs": "/var/lib/kafka/data" "log.retention.hours": "168" "num.partitions": "1" - "offsets.topic.replication.factor": "1" "transaction.state.log.replication.factor": "1" "transaction.state.log.min.isr": "1" "num.recovery.threads.per.data.dir": "5" - "log.retention.hours": "168" "zookeeper.connection.timeout.ms": "6000" "default.replication.factor": "1" "zookeeper.set.acl": "true" @@ -246,7 +289,7 @@ oof: enabled: false platform: enabled: true -policy: +policy: enabled: true policy-api: enabled: true @@ -272,38 +315,16 @@ policy: enabled: false policy-nexus: enabled: false + policy-clamp-cl-pf-ppnt: + enabled: false + policy-clamp-cl-http-ppnt: + enabled: false pomba: enabled: false portal: - enabled: true -robot: enabled: false - flavor: small - appcUsername: "appc@appc.onap.org" - appcPassword: "demo123456!" - openStackKeyStoneUrl: "http://10.12.25.2:5000" - openStackKeystoneAPIVersion: "v3" - openStackPublicNetId: "5771462c-9582-421c-b2dc-ee6a04ec9bde" - openStackTenantId: "c9ef9a6345b440b7a96d906a0f48c6b1" - openStackUserName: "user_name" - openStackUserDomain: "default" - openStackProjectName: "TEST" - ubuntu14Image: "trusty-server-cloudimg-amd64-disk1" - ubuntu16Image: "xenial-server-cloudimg-amd64-disk1" - openStackPrivateNetCidr: "10.0.0.0/16" - openStackPrivateNetId: "fd05c1ab-3f43-4f6f-8a8c-76aee04ef293" - openStackPrivateSubnetId: "fd05c1ab-3f43-4f6f-8a8c-76aee04ef293" - openStackSecurityGroup: "f05e9cbf-d40f-4d1f-9f91-d673ba591a3a" - openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "10.12.6.1" - vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - demoArtifactsVersion: "1.4.0" - demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases" - scriptVersion: "1.4.0" - nfsIpAddress: "10.12.6.1" - config: - openStackEncryptedPasswordHere: "e10c86aa13e692020233d18f0ef6d527" - openStackSoEncryptedPassword: "1DD1B3B4477FBAFAFEA617C575639C6F09E95446B5AE1F46C72B8FD960219ABB0DBA997790FCBB12" +robot: + enabled: false sdc: enabled: true sdc-be: @@ -325,40 +346,50 @@ sdc: cpu: 100m memory: 500Mi -sdnc: +sdnc: enabled: true replicaCount: 1 elasticsearch: master: replicaCount: 1 - mysql: - replicaCount: 1 - ueb-listener: - enabled: false - sdnc-ansible-server: - enabled: false - dgbuilder: - enabled: false - cds: - enabled: false - sdnc-web: - config: - topologyserver: - enabled: true - topologyserverUrl: http://topology.nonrtric:3001 - config: - sdnr: - enabled: true - # mode: web - SDNC contains device manager only plus dedicated webserver service for ODLUX (default), - # mode: dm - SDNC contains sdnr device manager + ODLUX components - mode: dm - # sdnronly: true starts sdnc container with odl and sdnrwt features only - sdnronly: false - sdnrdbTrustAllCerts: true - mountpointRegistrarEnabled: true - mountpointStateProviderEnabled: true - netconfCallHome: - enabled: true + mysql: + replicaCount: 1 + ueb-listener: + enabled: false + sdnc-ansible-server: + enabled: true + dgbuilder: + enabled: true + cds: + enabled: false + sdnc-web: + config: + topologyserver: + enabled: true + topologyserverUrl: http://topology.nonrtric:3001 + config: + sdnr: + enabled: true + # mode: web - SDNC contains device manager only plus dedicated webserver service for ODLUX (default), + # mode: dm - SDNC contains sdnr device manager + ODLUX components + mode: dm + # sdnronly: true starts sdnc container with odl and sdnrwt features only + sdnronly: false + sdnrdbTrustAllCerts: true + mountpointRegistrarEnabled: true + mountpointStateProviderEnabled: true + netconfCallHome: + enabled: true + vesCollector: + enabled: true + tls: + enabled: true + trustAllCertificates: true + username: sample1 + password: sample1 + address: dcae-ves-collector.onap + port: 8443 + eventLogMsgDetail: LONG sniro-emulator: enabled: false so: @@ -378,4 +409,3 @@ vid: vnfsdk: enabled: false - diff --git a/smo-install/helm-override/onap-override.yaml b/smo-install/helm-override/onap-override.yaml index 670cb053..bdb3f120 100644 --- a/smo-install/helm-override/onap-override.yaml +++ b/smo-install/helm-override/onap-override.yaml @@ -313,6 +313,11 @@ policy: enabled: false policy-nexus: enabled: false + policy-clamp-cl-pf-ppnt: + enabled: false + policy-clamp-cl-http-ppnt: + enabled: false + pomba: enabled: false portal: diff --git a/smo-install/helm-override/oran-override.yaml b/smo-install/helm-override/oran-override.yaml index 1cd48f4a..f607b786 100644 --- a/smo-install/helm-override/oran-override.yaml +++ b/smo-install/helm-override/oran-override.yaml @@ -86,6 +86,17 @@ oru-app: - simRu: o-ru-11211 simDu: o-du-1121 +a1simulator: + a1Sims: + - name: a1-sim-osc + a1Version: OSC_2.1.0 + allowHttp: true + - name: a1-sim-std-1 + a1Version: STD_1.1.3 + allowHttp: true + - name: a1-sim-std-2 + a1Version: STD_2.0.0 + allowHttp: true ######### RIC_AUX ######### diff --git a/smo-install/oran_oom/a1simulator/Chart.yaml b/smo-install/oran_oom/a1simulator/Chart.yaml index 60d0cbf9..66d4028b 100644 --- a/smo-install/oran_oom/a1simulator/Chart.yaml +++ b/smo-install/oran_oom/a1simulator/Chart.yaml @@ -1,21 +1,5 @@ -################################################################################ -# Copyright (c) 2020 Nordix Foundation. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - apiVersion: v1 appVersion: "2.0.0" description: A Helm chart for A1 simulator name: a1simulator -version: 2.0.0 +version: 2.1.0 diff --git a/smo-install/oran_oom/a1simulator/templates/configmapenv.yaml b/smo-install/oran_oom/a1simulator/templates/configmapenv.yaml new file mode 100644 index 00000000..742e7ee5 --- /dev/null +++ b/smo-install/oran_oom/a1simulator/templates/configmapenv.yaml @@ -0,0 +1,15 @@ +{{- range $i, $a1sim := .Values.a1Sims }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ $a1sim.name }}-configmapenv + labels: + sim-name: {{ $a1sim.name }}-env + release: {{ $.Release.Name }} + chart: {{ $.Chart.Name }} +data: + A1_VERSION: {{ $a1sim.a1Version | quote }} + ALLOW_HTTP: {{ $a1sim.allowHttp | quote }} + +{{- end }} diff --git a/smo-install/oran_oom/a1simulator/templates/deployment.yaml b/smo-install/oran_oom/a1simulator/templates/deployment.yaml new file mode 100644 index 00000000..bf4538cd --- /dev/null +++ b/smo-install/oran_oom/a1simulator/templates/deployment.yaml @@ -0,0 +1,36 @@ +{{- range $i, $a1sim := .Values.a1Sims }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $a1sim.name }} + labels: + sim-name: {{ $a1sim.name }} + release: {{ $.Release.Name }} + chart: {{ $.Chart.Name }} +spec: + replicas: 1 + selector: + matchLabels: + sim-name: {{ $a1sim.name }} + template: + metadata: + labels: + sim-name: {{ $a1sim.name }} + release: {{ $.Release.Name }} + chart: {{ $.Chart.Name }} + annotations: + checksum/config: {{ print $a1sim | sha256sum }} + spec: + hostname: "{{ $a1sim.name }}" + containers: + - name: {{ $.Chart.Name }} + image: "{{ $.Values.image.repository }}/{{ $.Values.image.name}}:{{ $.Values.image.tag }}" + imagePullPolicy: {{ $.Values.image.pullPolicy }} + tty: true + stdin: true + envFrom: + - configMapRef: + name: {{ $a1sim.name }}-configmapenv + +{{- end }} diff --git a/smo-install/oran_oom/a1simulator/templates/service.yaml b/smo-install/oran_oom/a1simulator/templates/service.yaml index d22654c9..a59e4fc8 100644 --- a/smo-install/oran_oom/a1simulator/templates/service.yaml +++ b/smo-install/oran_oom/a1simulator/templates/service.yaml @@ -1,41 +1,23 @@ -################################################################################ -# Copyright (c) 2020 Nordix Foundation. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -kind: Service +{{ range $i, $a1sim := .Values.a1Sims }} +--- apiVersion: v1 +kind: Service metadata: - name: {{ .Values.a1simulator.name }} - namespace: {{ include "common.namespace.nonrtric" . }} + name: "{{ $a1sim.name }}" labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + sim-name: {{ $a1sim.name }} + release: {{ $.Release.Name }} + chart: {{ $.Chart.Name }} spec: + type: {{ $.Values.service.type }} ports: - - name: {{ index .Values.a1simulator.service.httpName }} - port: {{ .Values.a1simulator.service.internalPort1 }} - targetPort: {{ .Values.a1simulator.service.targetPort1 }} - protocol: TCP - - name: {{ index .Values.a1simulator.service.httpsName }} - port: {{ .Values.a1simulator.service.internalPort2 }} - targetPort: {{ .Values.a1simulator.service.targetPort2 }} - protocol: TCP + - name: http + port: {{ $.Values.service.ports.httpPort }} + - name: https + port: {{ $.Values.service.ports.httpsPort }} selector: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - type: ClusterIP - clusterIP: None \ No newline at end of file + sim-name: {{ $a1sim.name }} + release: {{ $.Release.Name }} + chart: {{ $.Chart.Name }} + +{{ end }} diff --git a/smo-install/oran_oom/a1simulator/templates/statefulset.yaml b/smo-install/oran_oom/a1simulator/templates/statefulset.yaml deleted file mode 100644 index 939f3a3c..00000000 --- a/smo-install/oran_oom/a1simulator/templates/statefulset.yaml +++ /dev/null @@ -1,172 +0,0 @@ -################################################################################ -# Copyright (c) 2020 Nordix Foundation. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: {{ .Values.a1simulator.oscVersion.name }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - deployment.kubernetes.io/revision: '1' -spec: - replicas: {{ .Values.a1simulator.oscVersion.replicaCount }} - selector: - matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - serviceName: {{ .Values.a1simulator.name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.a1simulator" . }} - containers: - - name: {{ include "common.containername.a1simulator" . }} - image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }} - imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }} - ports: - - containerPort: {{ .Values.a1simulator.service.targetPort1 }} - protocol: TCP - - containerPort: {{ .Values.a1simulator.service.targetPort2 }} - protocol: TCP - readinessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }} - livenessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }} - env: - - name: A1_VERSION - value: OSC_2.1.0 - - name: ALLOW_HTTP - value: {{ .Values.a1simulator.service.allowHttp | quote}} - ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: {{ .Values.a1simulator.stdVersion.name }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - deployment.kubernetes.io/revision: '1' -spec: - replicas: {{ .Values.a1simulator.stdVersion.replicaCount }} - selector: - matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - serviceName: {{ .Values.a1simulator.name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.a1simulator" . }} - containers: - - name: {{ include "common.containername.a1simulator" . }} - image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }} - imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }} - ports: - - containerPort: {{ .Values.a1simulator.service.targetPort1 }} - protocol: TCP - - containerPort: {{ .Values.a1simulator.service.targetPort2 }} - protocol: TCP - readinessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }} - livenessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }} - env: - - name: A1_VERSION - value: STD_1.1.3 - - name: ALLOW_HTTP - value: {{ .Values.a1simulator.service.allowHttp | quote}} ---- -kind: StatefulSet -apiVersion: apps/v1 -metadata: - name: {{ .Values.a1simulator.stdVersion2.name }} - namespace: {{ include "common.namespace.nonrtric" . }} - generation: 1 - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - deployment.kubernetes.io/revision: '1' -spec: - replicas: {{ .Values.a1simulator.stdVersion2.replicaCount }} - selector: - matchLabels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - serviceName: {{ .Values.a1simulator.name }} - template: - metadata: - labels: - app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.a1simulator" . }} - release: {{ .Release.Name }} - spec: - hostname: {{ include "common.name.a1simulator" . }} - containers: - - name: {{ include "common.containername.a1simulator" . }} - image: {{ .Values.a1simulator.image.registry }}/{{ .Values.a1simulator.image.name }}:{{ .Values.a1simulator.image.tag }} - imagePullPolicy: {{ .Values.a1simulator.imagePullPolicy }} - ports: - - containerPort: {{ .Values.a1simulator.service.targetPort1 }} - protocol: TCP - - containerPort: {{ .Values.a1simulator.service.targetPort2 }} - protocol: TCP - readinessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.readiness.periodSeconds }} - livenessProbe: - tcpSocket: - port: {{ .Values.a1simulator.service.targetPort1 }} - initialDelaySeconds: {{ .Values.a1simulator.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.a1simulator.liveness.periodSeconds }} - env: - - name: A1_VERSION - value: STD_2.0.0 - - name: ALLOW_HTTP - value: {{ .Values.a1simulator.service.allowHttp | quote}} diff --git a/smo-install/oran_oom/a1simulator/values.yaml b/smo-install/oran_oom/a1simulator/values.yaml index 9836bf22..059fa994 100644 --- a/smo-install/oran_oom/a1simulator/values.yaml +++ b/smo-install/oran_oom/a1simulator/values.yaml @@ -1,51 +1,25 @@ -################################################################################ -# Copyright (c) 2020 Nordix Foundation. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ +# Static Defaults +image: + repository: 'nexus3.o-ran-sc.org:10002/o-ran-sc' + name: a1-simulator + tag: 2.1.0 + pullPolicy: IfNotPresent -# Default values for a1-simulator. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. +service: + type: ClusterIP + ports: + httpPort: 8085 + httpsPort: 8185 -a1simulator: - name: a1-sim - imagePullPolicy: IfNotPresent - image: - registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc' - name: a1-simulator - tag: 2.1.0 - service: +a1Sims: + - name: a1-sim-osc + a1Version: OSC_2.1.0 allowHttp: true - httpName: http - internalPort1: 8085 - targetPort1: 8085 - httpsName: https - internalPort2: 8185 - targetPort2: 8185 - liveness: - initialDelaySeconds: 20 - periodSeconds: 10 - readiness: - initialDelaySeconds: 20 - periodSeconds: 10 - oscVersion: - name: a1-sim-osc - replicaCount: 2 - stdVersion: - name: a1-sim-std - replicaCount: 2 - stdVersion2: - name: a1-sim-std2 - replicaCount: 2 + - name: a1-sim-std-1 + a1Version: STD_1.1.3 + allowHttp: true + + - name: a1-sim-std-2 + a1Version: STD_2.0.0 + allowHttp: true diff --git a/smo-install/oran_oom/nonrtric/requirements.yaml b/smo-install/oran_oom/nonrtric/requirements.yaml index b46044f8..4fd72e73 100644 --- a/smo-install/oran_oom/nonrtric/requirements.yaml +++ b/smo-install/oran_oom/nonrtric/requirements.yaml @@ -21,7 +21,7 @@ dependencies: condition: nonrtric.installA1controller - name: a1simulator - version: ~2.0.0 + version: ~2.1.0 repository: "@local" condition: nonrtric.installA1simulator diff --git a/smo-install/scripts/layer-0/0-setup-charts-museum.sh b/smo-install/scripts/layer-0/0-setup-charts-museum.sh index 2b9ac192..8377dd48 100755 --- a/smo-install/scripts/layer-0/0-setup-charts-museum.sh +++ b/smo-install/scripts/layer-0/0-setup-charts-museum.sh @@ -23,11 +23,14 @@ # ### +SCRIPT=$(readlink -f "$0") +SCRIPT_PATH=$(dirname "$SCRIPT") +cd $SCRIPT_PATH + #curl https://raw.githubusercontent.com/helm/chartmuseum/main/scripts/get-chartmuseum | bash -wget https://get.helm.sh/chartmuseum-v0.13.1-linux-amd64.tar.gz -mv chartmuseum-v0.13.1-linux-amd64.tar.gz /tmp cd /tmp +wget https://get.helm.sh/chartmuseum-v0.13.1-linux-amd64.tar.gz tar xvfz chartmuseum-v0.13.1-linux-amd64.tar.gz mv /tmp/linux-amd64/chartmuseum /usr/local/bin/chartmuseum -chartmuseum --port=18080 --storage="local" --storage-local-rootdir="./chartstorage" & +chartmuseum --port=18080 --storage="local" --storage-local-rootdir=$SCRIPT_PATH"/../../../chartstorage" & diff --git a/smo-install/scripts/layer-0/0-setup-tests-env.sh b/smo-install/scripts/layer-0/0-setup-tests-env.sh new file mode 100755 index 00000000..afd7f33d --- /dev/null +++ b/smo-install/scripts/layer-0/0-setup-tests-env.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# ORAN SMO Package +# ================================================================================ +# Copyright (C) 2021 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END============================================ +# =================================================================== +# +### + +#Maven +sudo apt-get update +sudo apt-get install maven -y +sudo apt-get install python3.8 -y +sudo apt-get install python3-pip -y + +pip3 install tox -- 2.16.6