Skip to content
Snippets Groups Projects
Commit 993c6dcd authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'azure-alternative-images' into 'master' 

Azure alternative images

See merge request !153
parents 2d41926d 198c37b7
No related branches found
No related tags found
1 merge request!153Azure alternative images
Pipeline #826 failed with stage
in 2 minutes and 4 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 466 additions and 441 deletions
several_volumes_ns/several_volumes_nsd.yaml
+ 21
− 21
View file @ 993c6dcd
nsd: nsd:
nsd: nsd:
- description: NS with 1 VNFs connected to mgmtnet VL - description: NS with 1 VNFs connected to mgmtnet VL
df: df:
- id: default-df - id: default-df
vnf-profile: vnf-profile:
- id: vnf-several-volumes - id: vnf-several-volumes
virtual-link-connectivity: virtual-link-connectivity:
- constituent-cpd-id: - constituent-cpd-id:
- constituent-base-element-id: vnf-several-volumes - constituent-base-element-id: vnf-several-volumes
constituent-cpd-id: vnf-mgmt-ext constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet virtual-link-profile-id: mgmtnet
vnfd-id: several_volumes-vnf vnfd-id: several_volumes-vnf
id: several_volumes-ns id: several_volumes-ns
name: several_volumes-ns name: several_volumes-ns
version: '1.0' version: '1.0'
virtual-link-desc: virtual-link-desc:
- id: mgmtnet - id: mgmtnet
mgmt-network: true mgmt-network: true
vnfd-id: vnfd-id:
- several_volumes-vnf - several_volumes-vnf
several_volumes_vnf/several_volumes_vnfd.yaml
+ 1
− 1
View file @ 993c6dcd
...@@ -28,7 +28,7 @@ vnfd: ...@@ -28,7 +28,7 @@ vnfd:
vim-type: aws vim-type: aws
- id: ubuntu20.04-azure - id: ubuntu20.04-azure
name: ubuntu20.04-azure name: ubuntu20.04-azure
image: Canonical:UbuntuServer:20.04-LTS:latest image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
vim-type: azure vim-type: azure
vdu: vdu:
- id: several_volumes-VM - id: several_volumes-VM
......
simple_2vm_ns/simple_2vm_nsd.yaml
+ 21
− 21
View file @ 993c6dcd
nsd: nsd:
nsd: nsd:
- description: NS with 1 VNFs connected by mgmtnet VL - description: NS with 1 VNFs connected by mgmtnet VL
df: df:
- id: default-df - id: default-df
vnf-profile: vnf-profile:
- id: '1' - id: '1'
virtual-link-connectivity: virtual-link-connectivity:
- constituent-cpd-id: - constituent-cpd-id:
- constituent-base-element-id: '1' - constituent-base-element-id: '1'
constituent-cpd-id: vnf-mgmt-ext constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet virtual-link-profile-id: mgmtnet
vnfd-id: simple_2vm-vnf vnfd-id: simple_2vm-vnf
id: simple_2vm-ns id: simple_2vm-ns
name: simple_2vm-ns name: simple_2vm-ns
version: '1.0' version: '1.0'
virtual-link-desc: virtual-link-desc:
- id: mgmtnet - id: mgmtnet
mgmt-network: true mgmt-network: true
vnfd-id: vnfd-id:
- simple_2vm-vnf - simple_2vm-vnf
simple_2vm_vnf/simple_2vm_vnfd.yaml
+ 90
− 82
View file @ 993c6dcd
vnfd: vnfd:
description: A VNF consisting of 2 VDUs connected to an internal VL description: A VNF consisting of 2 VDUs connected to an internal VL
df: df:
- id: default-df - id: default-df
instantiation-level: instantiation-level:
- id: default-instantiation-level - id: default-instantiation-level
vdu-level: vdu-level:
- number-of-instances: 1 - number-of-instances: 1
vdu-id: mgmtVM vdu-id: mgmtVM
- number-of-instances: 1 - number-of-instances: 1
vdu-id: dataVM vdu-id: dataVM
vdu-profile: vdu-profile:
- id: mgmtVM - id: mgmtVM
min-number-of-instances: 1 min-number-of-instances: 1
- id: dataVM - id: dataVM
min-number-of-instances: 1 min-number-of-instances: 1
ext-cpd: ext-cpd:
- id: vnf-mgmt-ext - id: vnf-mgmt-ext
int-cpd: int-cpd:
cpd: mgmtVM-eth0-int cpd: mgmtVM-eth0-int
vdu-id: mgmtVM vdu-id: mgmtVM
id: simple_2vm-vnf id: simple_2vm-vnf
int-virtual-link-desc: int-virtual-link-desc:
- id: internal - id: internal
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: simple_2vm-vnf product-name: simple_2vm-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu20.04 - id: ubuntu20.04
image: ubuntu20.04 image: ubuntu20.04
name: ubuntu20.04 name: ubuntu20.04
vdu: - id: ubuntu20.04-azure
- id: mgmtVM name: ubuntu20.04-azure
int-cpd: image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
- id: mgmtVM-eth0-int vim-type: azure
virtual-network-interface-requirement: vdu:
- name: mgmtVM-eth0 - id: mgmtVM
position: 1 int-cpd:
virtual-interface: - id: mgmtVM-eth0-int
type: PARAVIRT virtual-network-interface-requirement:
- id: mgmtVM-eth1-int - name: mgmtVM-eth0
int-virtual-link-desc: internal position: 1
virtual-network-interface-requirement: virtual-interface:
- name: mgmtVM-eth1 type: PARAVIRT
position: 2 - id: mgmtVM-eth1-int
virtual-interface: int-virtual-link-desc: internal
type: PARAVIRT virtual-network-interface-requirement:
name: mgmtVM - name: mgmtVM-eth1
sw-image-desc: ubuntu20.04 position: 2
virtual-compute-desc: mgmtVM-compute virtual-interface:
virtual-storage-desc: type: PARAVIRT
- mgmtVM-storage name: mgmtVM
- id: dataVM sw-image-desc: ubuntu20.04
int-cpd: alternative-sw-image-desc:
- id: dataVM-eth0-int - ubuntu20.04-azure
int-virtual-link-desc: internal virtual-compute-desc: mgmtVM-compute
virtual-network-interface-requirement: virtual-storage-desc:
- name: dataVM-eth0 - mgmtVM-storage
position: 1 - id: dataVM
virtual-interface: int-cpd:
type: PARAVIRT - id: dataVM-eth0-int
name: dataVM int-virtual-link-desc: internal
sw-image-desc: ubuntu20.04 virtual-network-interface-requirement:
virtual-compute-desc: dataVM-compute - name: dataVM-eth0
virtual-storage-desc: position: 1
- dataVM-storage virtual-interface:
version: '1.0' type: PARAVIRT
virtual-compute-desc: name: dataVM
- id: mgmtVM-compute sw-image-desc: ubuntu20.04
virtual-memory: alternative-sw-image-desc:
size: 1.0 - ubuntu20.04-azure
virtual-cpu: virtual-compute-desc: dataVM-compute
num-virtual-cpu: 1 virtual-storage-desc:
- id: dataVM-compute - dataVM-storage
virtual-memory: version: '1.0'
size: 1.0 virtual-compute-desc:
virtual-cpu: - id: mgmtVM-compute
num-virtual-cpu: 1 virtual-memory:
virtual-storage-desc: size: 1.0
- id: mgmtVM-storage virtual-cpu:
size-of-storage: 10 num-virtual-cpu: 1
- id: dataVM-storage - id: dataVM-compute
size-of-storage: 10 virtual-memory:
size: 1.0
virtual-cpu:
num-virtual-cpu: 1
virtual-storage-desc:
- id: mgmtVM-storage
size-of-storage: 10
- id: dataVM-storage
size-of-storage: 10
simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+ 65
− 65
View file @ 993c6dcd
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
labels: labels:
{{ include "eechart.labels" . | indent 4 }} {{ include "eechart.labels" . | indent 4 }}
spec: spec:
serviceName: {{ include "eechart.fullname" . }} serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }} serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext: securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }} {{- toYaml .Values.podSecurityContext | nindent 8 }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- name: grpc - name: grpc
containerPort: 50051 containerPort: 50051
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: osm-ee - name: osm-ee
mountPath: /app/storage mountPath: /app/storage
- name: osm-ee-source - name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf mountPath: /app/EE/osm_ee/vnf
volumes: volumes:
- name: osm-ee-source - name: osm-ee-source
configMap: configMap:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
volumeClaimTemplates: volumeClaimTemplates:
- metadata: - metadata:
name: osm-ee name: osm-ee
spec: spec:
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
resources: resources:
requests: requests:
storage: 1Gi storage: 1Gi
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.affinity }} {{- with .Values.affinity }}
affinity: affinity:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.tolerations }} {{- with .Values.tolerations }}
tolerations: tolerations:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
simple_ee_vnf/simple_ee_vnfd.yaml
+ 4
− 4
View file @ 993c6dcd
...@@ -59,9 +59,9 @@ vnfd: ...@@ -59,9 +59,9 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: simple_ee-vnf product-name: simple_ee-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.04 name: ubuntu18.04
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -73,7 +73,7 @@ vnfd: ...@@ -73,7 +73,7 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml
+ 5
− 5
View file @ 993c6dcd
...@@ -64,9 +64,9 @@ vnfd: ...@@ -64,9 +64,9 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: simple_nopasswd-vnf product-name: simple_nopasswd-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.04 name: ubuntu18.04
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -85,7 +85,7 @@ vnfd: ...@@ -85,7 +85,7 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
...@@ -105,7 +105,7 @@ vnfd: ...@@ -105,7 +105,7 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: dataVM name: dataVM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
virtual-compute-desc: dataVM-compute virtual-compute-desc: dataVM-compute
virtual-storage-desc: virtual-storage-desc:
- dataVM-storage - dataVM-storage
......
slice_basic_nst/slice_basic_2nd_nst.yaml
+ 51
− 51
View file @ 993c6dcd
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] # Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#NST to test VLD connection between Network Services within the same VIM #NST to test VLD connection between Network Services within the same VIM
nst: nst:
- id: slice_basic_nst2 - id: slice_basic_nst2
name: slice_basic_nst2 name: slice_basic_nst2
SNSSAI-identifier: SNSSAI-identifier:
slice-service-type: eMBB slice-service-type: eMBB
quality-of-service: quality-of-service:
id: 1 id: 1
netslice-subnet: netslice-subnet:
- id: slice_basic_nsd_2 - id: slice_basic_nsd_2
is-shared-nss: true is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3 - id: slice_basic_nsd_3
is-shared-nss: false is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns nsd-ref: slice_basic_ns
netslice-vld: netslice-vld:
- id: slice_vld_mgmt - id: slice_vld_mgmt
name: slice_vld_mgmt name: slice_vld_mgmt
type: ELAN type: ELAN
mgmt-network: true mgmt-network: true
nss-connection-point-ref: nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2 - nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3 - nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data2 - id: slice_vld_data2
name: slice_vld_data2 name: slice_vld_data2
type: ELAN type: ELAN
nss-connection-point-ref: nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2 - nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2 nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3 - nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data nsd-connection-point-ref: nsd_cp_data
slice_basic_nst/slice_basic_nst.yaml
+ 65
− 65
View file @ 993c6dcd
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] # Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
# You may obtain a copy of the License at # You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, software # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#NST to test VLD connection between Network Services within the same VIM #NST to test VLD connection between Network Services within the same VIM
nst: nst:
- id: slice_basic_nst - id: slice_basic_nst
name: slice_basic_nst name: slice_basic_nst
SNSSAI-identifier: SNSSAI-identifier:
slice-service-type: eMBB slice-service-type: eMBB
quality-of-service: quality-of-service:
id: 1 id: 1
netslice-subnet: netslice-subnet:
- id: slice_basic_nsd_1 - id: slice_basic_nsd_1
is-shared-nss: false is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns nsd-ref: slice_basic_ns
- id: slice_basic_nsd_2 - id: slice_basic_nsd_2
is-shared-nss: true is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3 - id: slice_basic_nsd_3
is-shared-nss: false is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns nsd-ref: slice_basic_ns
netslice-vld: netslice-vld:
- id: slice_vld_mgmt - id: slice_vld_mgmt
name: slice_vld_mgmt name: slice_vld_mgmt
type: ELAN type: ELAN
mgmt-network: true mgmt-network: true
nss-connection-point-ref: nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1 - nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_mgmt nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_2 - nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3 - nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data1 - id: slice_vld_data1
name: slice_vld_data1 name: slice_vld_data1
type: ELAN type: ELAN
nss-connection-point-ref: nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1 - nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_data nsd-connection-point-ref: nsd_cp_data
- nss-ref: slice_basic_nsd_2 - nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data1 nsd-connection-point-ref: nsd_cp_data1
- id: slice_vld_data2 - id: slice_vld_data2
name: slice_vld_data2 name: slice_vld_data2
type: ELAN type: ELAN
nss-connection-point-ref: nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2 - nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2 nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3 - nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data nsd-connection-point-ref: nsd_cp_data
snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+ 60
− 60
View file @ 993c6dcd
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
spec: spec:
serviceName: {{ include "eechart.fullname" . }} serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}} vnf: {{ .Values.global.osm.vnf_id | lower}}
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }} serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- name: grpc - name: grpc
containerPort: 50051 containerPort: 50051
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: osm-ee - name: osm-ee
mountPath: /app/storage mountPath: /app/storage
- name: osm-ee-source - name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume - name: snmp-config-volume
mountPath: /etc/snmp_exporter mountPath: /etc/snmp_exporter
- name: vnf-mibs - name: vnf-mibs
mountPath: /root/.snmp/mibs mountPath: /root/.snmp/mibs
- name: vnf-generator - name: vnf-generator
mountPath: /app/vnf/generator mountPath: /app/vnf/generator
volumes: volumes:
- name: osm-ee-source - name: osm-ee-source
configMap: configMap:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume - name: snmp-config-volume
hostPath: hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs - name: vnf-mibs
configMap: configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator - name: vnf-generator
configMap: configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee - name: osm-ee
hostPath: hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data path: /var/lib/osm/osm/osm_osm_packages/_data
snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+ 62
− 62
View file @ 993c6dcd
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
labels: labels:
{{ include "eechart.labels" . | indent 4 }} {{ include "eechart.labels" . | indent 4 }}
spec: spec:
serviceName: {{ include "eechart.fullname" . }} serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}} vnf: {{ .Values.global.osm.vnf_id | lower}}
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }} serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- name: grpc - name: grpc
containerPort: 50051 containerPort: 50051
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: osm-ee - name: osm-ee
mountPath: /app/storage mountPath: /app/storage
- name: osm-ee-source - name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume - name: snmp-config-volume
mountPath: /etc/snmp_exporter mountPath: /etc/snmp_exporter
- name: vnf-mibs - name: vnf-mibs
mountPath: /root/.snmp/mibs mountPath: /root/.snmp/mibs
- name: vnf-generator - name: vnf-generator
mountPath: /app/vnf/generator mountPath: /app/vnf/generator
volumes: volumes:
- name: osm-ee-source - name: osm-ee-source
configMap: configMap:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume - name: snmp-config-volume
hostPath: hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs - name: vnf-mibs
configMap: configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator - name: vnf-generator
configMap: configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee - name: osm-ee
hostPath: hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data path: /var/lib/osm/osm/osm_osm_packages/_data
ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml
+ 6
− 0
View file @ 993c6dcd
...@@ -34,6 +34,10 @@ vnfd: ...@@ -34,6 +34,10 @@ vnfd:
- id: ubuntu20.04 - id: ubuntu20.04
image: ubuntu20.04 image: ubuntu20.04
name: ubuntu20.04 name: ubuntu20.04
- id: ubuntu20.04-azure
name: ubuntu20.04-azure
image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: dataVM id: dataVM
...@@ -64,6 +68,8 @@ vnfd: ...@@ -64,6 +68,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: dataVM name: dataVM
sw-image-desc: ubuntu20.04 sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-azure
virtual-compute-desc: dataVM-compute virtual-compute-desc: dataVM-compute
virtual-storage-desc: virtual-storage-desc:
- dataVM-storage - dataVM-storage
......
ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
+ 15
− 4
View file @ 993c6dcd
...@@ -20,9 +20,17 @@ vnfd: ...@@ -20,9 +20,17 @@ vnfd:
product-name: ubuntu_cloudinit-vnf product-name: ubuntu_cloudinit-vnf
provider: OSM provider: OSM
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.04 name: ubuntu18.04
- id: ubuntu18.04-aws
name: ubuntu18.04-aws
image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
vim-type: aws
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-init.cfg - cloud-init-file: cloud-init.cfg
description: ubuntu_cloudinit-vnf-VM description: ubuntu_cloudinit-vnf-VM
...@@ -34,7 +42,10 @@ vnfd: ...@@ -34,7 +42,10 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: ubuntu_cloudinit-vnf-VM name: ubuntu_cloudinit-vnf-VM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-aws
- ubuntu18.04-azure
virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute
virtual-storage-desc: virtual-storage-desc:
- ubuntu_cloudinit-vnf-VM-storage - ubuntu_cloudinit-vnf-VM-storage
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment