From 203e75e2e2fa3647108f68a272d78be98eb7e7a6 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 24 May 2021 16:22:40 +0200
Subject: [PATCH] Remove CRLF line terminators
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml | 42 ++--
ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml | 194 +++++++++---------
.../eechart/templates/statefulset.yaml | 130 ++++++------
several_volumes_ns/several_volumes_nsd.yaml | 42 ++--
simple_2vm_ns/simple_2vm_nsd.yaml | 42 ++--
simple_2vm_vnf/simple_2vm_vnfd.yaml | 180 ++++++++--------
.../eechart/templates/statefulset.yaml | 130 ++++++------
slice_basic_nst/slice_basic_2nd_nst.yaml | 102 ++++-----
slice_basic_nst/slice_basic_nst.yaml | 130 ++++++------
.../eechart/templates/statefulset.yaml | 120 +++++------
.../eechart/templates/statefulset.yaml | 124 +++++------
11 files changed, 618 insertions(+), 618 deletions(-)
diff --git a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml
index 72e7c3ff..2195f42d 100644
--- a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml
+++ b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml
@@ -1,21 +1,21 @@
-nsd:
- nsd:
- - description: NS with 1 VNFs connected by mgmtnet VL
- df:
- - id: default-df
- vnf-profile:
- - id: '1'
- virtual-link-connectivity:
- - constituent-cpd-id:
- - constituent-base-element-id: '1'
- constituent-cpd-id: vnf-mgmt-ext
- virtual-link-profile-id: mgmtnet
- vnfd-id: ipprofile_2vm-vnf
- id: ipprofile_2vm-ns
- name: ipprofile_2vm-ns
- version: '1.0'
- virtual-link-desc:
- - id: mgmtnet
- mgmt-network: true
- vnfd-id:
- - ipprofile_2vm-vnf
+nsd:
+ nsd:
+ - description: NS with 1 VNFs connected by mgmtnet VL
+ df:
+ - id: default-df
+ vnf-profile:
+ - id: '1'
+ virtual-link-connectivity:
+ - constituent-cpd-id:
+ - constituent-base-element-id: '1'
+ constituent-cpd-id: vnf-mgmt-ext
+ virtual-link-profile-id: mgmtnet
+ vnfd-id: ipprofile_2vm-vnf
+ id: ipprofile_2vm-ns
+ name: ipprofile_2vm-ns
+ version: '1.0'
+ virtual-link-desc:
+ - id: mgmtnet
+ mgmt-network: true
+ vnfd-id:
+ - ipprofile_2vm-vnf
diff --git a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
index 791bf9cd..b62b5277 100644
--- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
+++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
@@ -1,97 +1,97 @@
-vnfd:
- description: A VNF consisting of 2 VDUs connected to an internal VL
- df:
- - id: default-df
- instantiation-level:
- - id: default-instantiation-level
- vdu-level:
- - number-of-instances: 1
- vdu-id: mgmtVM
- - number-of-instances: 1
- vdu-id: dataVM
- vdu-profile:
- - id: mgmtVM
- min-number-of-instances: 1
- - id: dataVM
- min-number-of-instances: 1
- virtual-link-profile:
- - id: internal
- flavour: ''
- virtual-link-protocol-data:
- l3-protocol-data:
- cidr: 192.168.200.0/24
- ip-version: ipv4
- ext-cpd:
- - id: vnf-mgmt-ext
- int-cpd:
- cpd: mgmtVM-eth0-int
- vdu-id: mgmtVM
- id: ipprofile_2vm-vnf
- int-virtual-link-desc:
- - id: internal
- mgmt-cp: vnf-mgmt-ext
- product-name: ipprofile_2vm-vnf
- sw-image-desc:
- - id: ubuntu20.04
- image: ubuntu20.04
- name: ubuntu20.04
- - id: ubuntu20.04-azure
- name: ubuntu20.04-azure
- image: Canonical:UbuntuServer:20.04-LTS:latest
- vim-type: azure
- vdu:
- - id: mgmtVM
- int-cpd:
- - id: mgmtVM-eth0-int
- virtual-network-interface-requirement:
- - name: mgmtVM-eth0
- position: 1
- virtual-interface:
- type: PARAVIRT
- - id: mgmtVM-eth1-int
- int-virtual-link-desc: internal
- virtual-network-interface-requirement:
- - name: mgmtVM-eth1
- position: 2
- virtual-interface:
- type: PARAVIRT
- name: mgmtVM
- sw-image-desc: ubuntu20.04
- alternative-sw-image-desc:
- - ubuntu20.04-azure
- virtual-compute-desc: mgmtVM-compute
- virtual-storage-desc:
- - mgmtVM-storage
- - id: dataVM
- int-cpd:
- - id: dataVM-eth0-int
- int-virtual-link-desc: internal
- virtual-network-interface-requirement:
- - name: dataVM-eth0
- position: 1
- virtual-interface:
- type: PARAVIRT
- name: dataVM
- sw-image-desc: ubuntu20.04
- alternative-sw-image-desc:
- - ubuntu20.04-azure
- virtual-compute-desc: dataVM-compute
- virtual-storage-desc:
- - dataVM-storage
- version: '1.0'
- virtual-compute-desc:
- - id: mgmtVM-compute
- virtual-memory:
- size: 1.0
- virtual-cpu:
- num-virtual-cpu: 1
- - id: dataVM-compute
- 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
+vnfd:
+ description: A VNF consisting of 2 VDUs connected to an internal VL
+ df:
+ - id: default-df
+ instantiation-level:
+ - id: default-instantiation-level
+ vdu-level:
+ - number-of-instances: 1
+ vdu-id: mgmtVM
+ - number-of-instances: 1
+ vdu-id: dataVM
+ vdu-profile:
+ - id: mgmtVM
+ min-number-of-instances: 1
+ - id: dataVM
+ min-number-of-instances: 1
+ virtual-link-profile:
+ - id: internal
+ flavour: ''
+ virtual-link-protocol-data:
+ l3-protocol-data:
+ cidr: 192.168.200.0/24
+ ip-version: ipv4
+ ext-cpd:
+ - id: vnf-mgmt-ext
+ int-cpd:
+ cpd: mgmtVM-eth0-int
+ vdu-id: mgmtVM
+ id: ipprofile_2vm-vnf
+ int-virtual-link-desc:
+ - id: internal
+ mgmt-cp: vnf-mgmt-ext
+ product-name: ipprofile_2vm-vnf
+ sw-image-desc:
+ - id: ubuntu20.04
+ image: ubuntu20.04
+ name: ubuntu20.04
+ - id: ubuntu20.04-azure
+ name: ubuntu20.04-azure
+ image: Canonical:UbuntuServer:20.04-LTS:latest
+ vim-type: azure
+ vdu:
+ - id: mgmtVM
+ int-cpd:
+ - id: mgmtVM-eth0-int
+ virtual-network-interface-requirement:
+ - name: mgmtVM-eth0
+ position: 1
+ virtual-interface:
+ type: PARAVIRT
+ - id: mgmtVM-eth1-int
+ int-virtual-link-desc: internal
+ virtual-network-interface-requirement:
+ - name: mgmtVM-eth1
+ position: 2
+ virtual-interface:
+ type: PARAVIRT
+ name: mgmtVM
+ sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-azure
+ virtual-compute-desc: mgmtVM-compute
+ virtual-storage-desc:
+ - mgmtVM-storage
+ - id: dataVM
+ int-cpd:
+ - id: dataVM-eth0-int
+ int-virtual-link-desc: internal
+ virtual-network-interface-requirement:
+ - name: dataVM-eth0
+ position: 1
+ virtual-interface:
+ type: PARAVIRT
+ name: dataVM
+ sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-azure
+ virtual-compute-desc: dataVM-compute
+ virtual-storage-desc:
+ - dataVM-storage
+ version: '1.0'
+ virtual-compute-desc:
+ - id: mgmtVM-compute
+ virtual-memory:
+ size: 1.0
+ virtual-cpu:
+ num-virtual-cpu: 1
+ - id: dataVM-compute
+ 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
diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
index 9af244de..5557b9cb 100644
--- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
+++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
@@ -1,65 +1,65 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: {{ include "eechart.fullname" . }}
- labels:
-{{ include "eechart.labels" . | indent 4 }}
-spec:
- serviceName: {{ include "eechart.fullname" . }}
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- imagePullSecrets:
- - name: regcred
- serviceAccountName: {{ template "eechart.serviceAccountName" . }}
- securityContext:
- runAsUser: 0
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- ports:
- - name: grpc
- containerPort: 50051
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: osm-ee
- mountPath: /app/storage
- - name: osm-ee-source
- mountPath: /app/EE/osm_ee/vnf
-{{- if .Values.snmpexporter.enabled }}
- - name: snmp-config-volume
- mountPath: /etc/snmp_exporter
- - name: vnf-mibs
- mountPath: /root/.snmp/mibs
- - name: vnf-generator
- mountPath: /app/vnf/generator
-{{- end }}
- volumes:
- - name: osm-ee-source
- configMap:
- name: {{ include "eechart.fullname" . }}
- - name: osm-ee
- hostPath:
- path: /var/lib/osm/osm/osm_osm_packages/_data
-{{- if .Values.snmpexporter.enabled }}
- - name: snmp-config-volume
- hostPath:
- path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- - name: vnf-mibs
- configMap:
- name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- - name: vnf-generator
- configMap:
- name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
-{{- end }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ include "eechart.fullname" . }}
+ labels:
+{{ include "eechart.labels" . | indent 4 }}
+spec:
+ serviceName: {{ include "eechart.fullname" . }}
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ spec:
+ imagePullSecrets:
+ - name: regcred
+ serviceAccountName: {{ template "eechart.serviceAccountName" . }}
+ securityContext:
+ runAsUser: 0
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: grpc
+ containerPort: 50051
+ protocol: TCP
+ resources:
+ {{- toYaml .Values.resources | nindent 12 }}
+ volumeMounts:
+ - name: osm-ee
+ mountPath: /app/storage
+ - name: osm-ee-source
+ mountPath: /app/EE/osm_ee/vnf
+{{- if .Values.snmpexporter.enabled }}
+ - name: snmp-config-volume
+ mountPath: /etc/snmp_exporter
+ - name: vnf-mibs
+ mountPath: /root/.snmp/mibs
+ - name: vnf-generator
+ mountPath: /app/vnf/generator
+{{- end }}
+ volumes:
+ - name: osm-ee-source
+ configMap:
+ name: {{ include "eechart.fullname" . }}
+ - name: osm-ee
+ hostPath:
+ path: /var/lib/osm/osm/osm_osm_packages/_data
+{{- if .Values.snmpexporter.enabled }}
+ - name: snmp-config-volume
+ hostPath:
+ path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
+ - name: vnf-mibs
+ configMap:
+ name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+ - name: vnf-generator
+ configMap:
+ name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+{{- end }}
diff --git a/several_volumes_ns/several_volumes_nsd.yaml b/several_volumes_ns/several_volumes_nsd.yaml
index 45f82de6..30726a29 100755
--- a/several_volumes_ns/several_volumes_nsd.yaml
+++ b/several_volumes_ns/several_volumes_nsd.yaml
@@ -1,21 +1,21 @@
-nsd:
- nsd:
- - description: NS with 1 VNFs connected to mgmtnet VL
- df:
- - id: default-df
- vnf-profile:
- - id: vnf-several-volumes
- virtual-link-connectivity:
- - constituent-cpd-id:
- - constituent-base-element-id: vnf-several-volumes
- constituent-cpd-id: vnf-mgmt-ext
- virtual-link-profile-id: mgmtnet
- vnfd-id: several_volumes-vnf
- id: several_volumes-ns
- name: several_volumes-ns
- version: '1.0'
- virtual-link-desc:
- - id: mgmtnet
- mgmt-network: true
- vnfd-id:
- - several_volumes-vnf
+nsd:
+ nsd:
+ - description: NS with 1 VNFs connected to mgmtnet VL
+ df:
+ - id: default-df
+ vnf-profile:
+ - id: vnf-several-volumes
+ virtual-link-connectivity:
+ - constituent-cpd-id:
+ - constituent-base-element-id: vnf-several-volumes
+ constituent-cpd-id: vnf-mgmt-ext
+ virtual-link-profile-id: mgmtnet
+ vnfd-id: several_volumes-vnf
+ id: several_volumes-ns
+ name: several_volumes-ns
+ version: '1.0'
+ virtual-link-desc:
+ - id: mgmtnet
+ mgmt-network: true
+ vnfd-id:
+ - several_volumes-vnf
diff --git a/simple_2vm_ns/simple_2vm_nsd.yaml b/simple_2vm_ns/simple_2vm_nsd.yaml
index a3de4758..27194655 100755
--- a/simple_2vm_ns/simple_2vm_nsd.yaml
+++ b/simple_2vm_ns/simple_2vm_nsd.yaml
@@ -1,21 +1,21 @@
-nsd:
- nsd:
- - description: NS with 1 VNFs connected by mgmtnet VL
- df:
- - id: default-df
- vnf-profile:
- - id: '1'
- virtual-link-connectivity:
- - constituent-cpd-id:
- - constituent-base-element-id: '1'
- constituent-cpd-id: vnf-mgmt-ext
- virtual-link-profile-id: mgmtnet
- vnfd-id: simple_2vm-vnf
- id: simple_2vm-ns
- name: simple_2vm-ns
- version: '1.0'
- virtual-link-desc:
- - id: mgmtnet
- mgmt-network: true
- vnfd-id:
- - simple_2vm-vnf
+nsd:
+ nsd:
+ - description: NS with 1 VNFs connected by mgmtnet VL
+ df:
+ - id: default-df
+ vnf-profile:
+ - id: '1'
+ virtual-link-connectivity:
+ - constituent-cpd-id:
+ - constituent-base-element-id: '1'
+ constituent-cpd-id: vnf-mgmt-ext
+ virtual-link-profile-id: mgmtnet
+ vnfd-id: simple_2vm-vnf
+ id: simple_2vm-ns
+ name: simple_2vm-ns
+ version: '1.0'
+ virtual-link-desc:
+ - id: mgmtnet
+ mgmt-network: true
+ vnfd-id:
+ - simple_2vm-vnf
diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml
index be7c75b3..39df1cbb 100755
--- a/simple_2vm_vnf/simple_2vm_vnfd.yaml
+++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml
@@ -1,90 +1,90 @@
-vnfd:
- description: A VNF consisting of 2 VDUs connected to an internal VL
- df:
- - id: default-df
- instantiation-level:
- - id: default-instantiation-level
- vdu-level:
- - number-of-instances: 1
- vdu-id: mgmtVM
- - number-of-instances: 1
- vdu-id: dataVM
- vdu-profile:
- - id: mgmtVM
- min-number-of-instances: 1
- - id: dataVM
- min-number-of-instances: 1
- ext-cpd:
- - id: vnf-mgmt-ext
- int-cpd:
- cpd: mgmtVM-eth0-int
- vdu-id: mgmtVM
- id: simple_2vm-vnf
- int-virtual-link-desc:
- - id: internal
- mgmt-cp: vnf-mgmt-ext
- product-name: simple_2vm-vnf
- sw-image-desc:
- - id: ubuntu20.04
- image: ubuntu20.04
- name: ubuntu20.04
- - id: ubuntu20.04-azure
- name: ubuntu20.04-azure
- image: Canonical:UbuntuServer:20.04-LTS:latest
- vim-type: azure
- vdu:
- - id: mgmtVM
- int-cpd:
- - id: mgmtVM-eth0-int
- virtual-network-interface-requirement:
- - name: mgmtVM-eth0
- position: 1
- virtual-interface:
- type: PARAVIRT
- - id: mgmtVM-eth1-int
- int-virtual-link-desc: internal
- virtual-network-interface-requirement:
- - name: mgmtVM-eth1
- position: 2
- virtual-interface:
- type: PARAVIRT
- name: mgmtVM
- sw-image-desc: ubuntu20.04
- alternative-sw-image-desc:
- - ubuntu20.04-azure
- virtual-compute-desc: mgmtVM-compute
- virtual-storage-desc:
- - mgmtVM-storage
- - id: dataVM
- int-cpd:
- - id: dataVM-eth0-int
- int-virtual-link-desc: internal
- virtual-network-interface-requirement:
- - name: dataVM-eth0
- position: 1
- virtual-interface:
- type: PARAVIRT
- name: dataVM
- sw-image-desc: ubuntu20.04
- alternative-sw-image-desc:
- - ubuntu20.04-azure
- virtual-compute-desc: dataVM-compute
- virtual-storage-desc:
- - dataVM-storage
- version: '1.0'
- virtual-compute-desc:
- - id: mgmtVM-compute
- virtual-memory:
- size: 1.0
- virtual-cpu:
- num-virtual-cpu: 1
- - id: dataVM-compute
- 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
+vnfd:
+ description: A VNF consisting of 2 VDUs connected to an internal VL
+ df:
+ - id: default-df
+ instantiation-level:
+ - id: default-instantiation-level
+ vdu-level:
+ - number-of-instances: 1
+ vdu-id: mgmtVM
+ - number-of-instances: 1
+ vdu-id: dataVM
+ vdu-profile:
+ - id: mgmtVM
+ min-number-of-instances: 1
+ - id: dataVM
+ min-number-of-instances: 1
+ ext-cpd:
+ - id: vnf-mgmt-ext
+ int-cpd:
+ cpd: mgmtVM-eth0-int
+ vdu-id: mgmtVM
+ id: simple_2vm-vnf
+ int-virtual-link-desc:
+ - id: internal
+ mgmt-cp: vnf-mgmt-ext
+ product-name: simple_2vm-vnf
+ sw-image-desc:
+ - id: ubuntu20.04
+ image: ubuntu20.04
+ name: ubuntu20.04
+ - id: ubuntu20.04-azure
+ name: ubuntu20.04-azure
+ image: Canonical:UbuntuServer:20.04-LTS:latest
+ vim-type: azure
+ vdu:
+ - id: mgmtVM
+ int-cpd:
+ - id: mgmtVM-eth0-int
+ virtual-network-interface-requirement:
+ - name: mgmtVM-eth0
+ position: 1
+ virtual-interface:
+ type: PARAVIRT
+ - id: mgmtVM-eth1-int
+ int-virtual-link-desc: internal
+ virtual-network-interface-requirement:
+ - name: mgmtVM-eth1
+ position: 2
+ virtual-interface:
+ type: PARAVIRT
+ name: mgmtVM
+ sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-azure
+ virtual-compute-desc: mgmtVM-compute
+ virtual-storage-desc:
+ - mgmtVM-storage
+ - id: dataVM
+ int-cpd:
+ - id: dataVM-eth0-int
+ int-virtual-link-desc: internal
+ virtual-network-interface-requirement:
+ - name: dataVM-eth0
+ position: 1
+ virtual-interface:
+ type: PARAVIRT
+ name: dataVM
+ sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-azure
+ virtual-compute-desc: dataVM-compute
+ virtual-storage-desc:
+ - dataVM-storage
+ version: '1.0'
+ virtual-compute-desc:
+ - id: mgmtVM-compute
+ virtual-memory:
+ size: 1.0
+ virtual-cpu:
+ num-virtual-cpu: 1
+ - id: dataVM-compute
+ 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
diff --git a/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index 3d721fe2..e31e589a 100755
--- a/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -1,65 +1,65 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: {{ include "eechart.fullname" . }}
- labels:
-{{ include "eechart.labels" . | indent 4 }}
-spec:
- serviceName: {{ include "eechart.fullname" . }}
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- spec:
- imagePullSecrets:
- - name: regcred
- serviceAccountName: {{ template "eechart.serviceAccountName" . }}
- securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
- containers:
- - name: {{ .Chart.Name }}
- securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- ports:
- - name: grpc
- containerPort: 50051
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: osm-ee
- mountPath: /app/storage
- - name: osm-ee-source
- mountPath: /app/EE/osm_ee/vnf
- volumes:
- - name: osm-ee-source
- configMap:
- name: {{ include "eechart.fullname" . }}
- volumeClaimTemplates:
- - metadata:
- name: osm-ee
- spec:
- accessModes: [ "ReadWriteOnce" ]
- resources:
- requests:
- storage: 1Gi
- {{- with .Values.nodeSelector }}
- nodeSelector:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.affinity }}
- affinity:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.tolerations }}
- tolerations:
- {{- toYaml . | nindent 8 }}
- {{- end }}
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ include "eechart.fullname" . }}
+ labels:
+{{ include "eechart.labels" . | indent 4 }}
+spec:
+ serviceName: {{ include "eechart.fullname" . }}
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ spec:
+ imagePullSecrets:
+ - name: regcred
+ serviceAccountName: {{ template "eechart.serviceAccountName" . }}
+ securityContext:
+ {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ containers:
+ - name: {{ .Chart.Name }}
+ securityContext:
+ {{- toYaml .Values.securityContext | nindent 12 }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: grpc
+ containerPort: 50051
+ protocol: TCP
+ resources:
+ {{- toYaml .Values.resources | nindent 12 }}
+ volumeMounts:
+ - name: osm-ee
+ mountPath: /app/storage
+ - name: osm-ee-source
+ mountPath: /app/EE/osm_ee/vnf
+ volumes:
+ - name: osm-ee-source
+ configMap:
+ name: {{ include "eechart.fullname" . }}
+ volumeClaimTemplates:
+ - metadata:
+ name: osm-ee
+ spec:
+ accessModes: [ "ReadWriteOnce" ]
+ resources:
+ requests:
+ storage: 1Gi
+ {{- with .Values.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.affinity }}
+ affinity:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
diff --git a/slice_basic_nst/slice_basic_2nd_nst.yaml b/slice_basic_nst/slice_basic_2nd_nst.yaml
index 02c0dc2b..c89492a9 100644
--- a/slice_basic_nst/slice_basic_2nd_nst.yaml
+++ b/slice_basic_nst/slice_basic_2nd_nst.yaml
@@ -1,51 +1,51 @@
-# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
-#
-# 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.
-
-#NST to test VLD connection between Network Services within the same VIM
-nst:
-- id: slice_basic_nst2
- name: slice_basic_nst2
- SNSSAI-identifier:
- slice-service-type: eMBB
- quality-of-service:
- id: 1
-
- netslice-subnet:
- - id: slice_basic_nsd_2
- is-shared-nss: true
- description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
- nsd-ref: slice_basic_middle_ns
- - id: slice_basic_nsd_3
- is-shared-nss: false
- description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
- nsd-ref: slice_basic_ns
-
- netslice-vld:
- - id: slice_vld_mgmt
- name: slice_vld_mgmt
- type: ELAN
- mgmt-network: true
- nss-connection-point-ref:
- - nss-ref: slice_basic_nsd_2
- nsd-connection-point-ref: nsd_cp_mgmt
- - nss-ref: slice_basic_nsd_3
- nsd-connection-point-ref: nsd_cp_mgmt
- - id: slice_vld_data2
- name: slice_vld_data2
- type: ELAN
- nss-connection-point-ref:
- - nss-ref: slice_basic_nsd_2
- nsd-connection-point-ref: nsd_cp_data2
- - nss-ref: slice_basic_nsd_3
- nsd-connection-point-ref: nsd_cp_data
+# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
+#
+# 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.
+
+#NST to test VLD connection between Network Services within the same VIM
+nst:
+- id: slice_basic_nst2
+ name: slice_basic_nst2
+ SNSSAI-identifier:
+ slice-service-type: eMBB
+ quality-of-service:
+ id: 1
+
+ netslice-subnet:
+ - id: slice_basic_nsd_2
+ is-shared-nss: true
+ description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
+ nsd-ref: slice_basic_middle_ns
+ - id: slice_basic_nsd_3
+ is-shared-nss: false
+ description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
+ nsd-ref: slice_basic_ns
+
+ netslice-vld:
+ - id: slice_vld_mgmt
+ name: slice_vld_mgmt
+ type: ELAN
+ mgmt-network: true
+ nss-connection-point-ref:
+ - nss-ref: slice_basic_nsd_2
+ nsd-connection-point-ref: nsd_cp_mgmt
+ - nss-ref: slice_basic_nsd_3
+ nsd-connection-point-ref: nsd_cp_mgmt
+ - id: slice_vld_data2
+ name: slice_vld_data2
+ type: ELAN
+ nss-connection-point-ref:
+ - nss-ref: slice_basic_nsd_2
+ nsd-connection-point-ref: nsd_cp_data2
+ - nss-ref: slice_basic_nsd_3
+ nsd-connection-point-ref: nsd_cp_data
diff --git a/slice_basic_nst/slice_basic_nst.yaml b/slice_basic_nst/slice_basic_nst.yaml
index eb2982ed..b4f7a435 100644
--- a/slice_basic_nst/slice_basic_nst.yaml
+++ b/slice_basic_nst/slice_basic_nst.yaml
@@ -1,65 +1,65 @@
-# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
-#
-# 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.
-
-#NST to test VLD connection between Network Services within the same VIM
-nst:
-- id: slice_basic_nst
- name: slice_basic_nst
- SNSSAI-identifier:
- slice-service-type: eMBB
- quality-of-service:
- id: 1
-
- netslice-subnet:
- - id: slice_basic_nsd_1
- is-shared-nss: false
- description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
- nsd-ref: slice_basic_ns
- - id: slice_basic_nsd_2
- is-shared-nss: true
- description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
- nsd-ref: slice_basic_middle_ns
- - id: slice_basic_nsd_3
- is-shared-nss: false
- description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
- nsd-ref: slice_basic_ns
-
- netslice-vld:
- - id: slice_vld_mgmt
- name: slice_vld_mgmt
- type: ELAN
- mgmt-network: true
- nss-connection-point-ref:
- - nss-ref: slice_basic_nsd_1
- nsd-connection-point-ref: nsd_cp_mgmt
- - nss-ref: slice_basic_nsd_2
- nsd-connection-point-ref: nsd_cp_mgmt
- - nss-ref: slice_basic_nsd_3
- nsd-connection-point-ref: nsd_cp_mgmt
- - id: slice_vld_data1
- name: slice_vld_data1
- type: ELAN
- nss-connection-point-ref:
- - nss-ref: slice_basic_nsd_1
- nsd-connection-point-ref: nsd_cp_data
- - nss-ref: slice_basic_nsd_2
- nsd-connection-point-ref: nsd_cp_data1
- - id: slice_vld_data2
- name: slice_vld_data2
- type: ELAN
- nss-connection-point-ref:
- - nss-ref: slice_basic_nsd_2
- nsd-connection-point-ref: nsd_cp_data2
- - nss-ref: slice_basic_nsd_3
- nsd-connection-point-ref: nsd_cp_data
+# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
+#
+# 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.
+
+#NST to test VLD connection between Network Services within the same VIM
+nst:
+- id: slice_basic_nst
+ name: slice_basic_nst
+ SNSSAI-identifier:
+ slice-service-type: eMBB
+ quality-of-service:
+ id: 1
+
+ netslice-subnet:
+ - id: slice_basic_nsd_1
+ is-shared-nss: false
+ description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
+ nsd-ref: slice_basic_ns
+ - id: slice_basic_nsd_2
+ is-shared-nss: true
+ description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
+ nsd-ref: slice_basic_middle_ns
+ - id: slice_basic_nsd_3
+ is-shared-nss: false
+ description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
+ nsd-ref: slice_basic_ns
+
+ netslice-vld:
+ - id: slice_vld_mgmt
+ name: slice_vld_mgmt
+ type: ELAN
+ mgmt-network: true
+ nss-connection-point-ref:
+ - nss-ref: slice_basic_nsd_1
+ nsd-connection-point-ref: nsd_cp_mgmt
+ - nss-ref: slice_basic_nsd_2
+ nsd-connection-point-ref: nsd_cp_mgmt
+ - nss-ref: slice_basic_nsd_3
+ nsd-connection-point-ref: nsd_cp_mgmt
+ - id: slice_vld_data1
+ name: slice_vld_data1
+ type: ELAN
+ nss-connection-point-ref:
+ - nss-ref: slice_basic_nsd_1
+ nsd-connection-point-ref: nsd_cp_data
+ - nss-ref: slice_basic_nsd_2
+ nsd-connection-point-ref: nsd_cp_data1
+ - id: slice_vld_data2
+ name: slice_vld_data2
+ type: ELAN
+ nss-connection-point-ref:
+ - nss-ref: slice_basic_nsd_2
+ nsd-connection-point-ref: nsd_cp_data2
+ - nss-ref: slice_basic_nsd_3
+ nsd-connection-point-ref: nsd_cp_data
diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index c188ad1d..24cc1db2 100755
--- a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -1,60 +1,60 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: {{ include "eechart.fullname" . }}
-spec:
- serviceName: {{ include "eechart.fullname" . }}
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- vnf: {{ .Values.global.osm.vnf_id | lower}}
- spec:
- imagePullSecrets:
- - name: regcred
- serviceAccountName: {{ template "eechart.serviceAccountName" . }}
- securityContext:
- runAsUser: 0
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- ports:
- - name: grpc
- containerPort: 50051
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: osm-ee
- mountPath: /app/storage
- - name: osm-ee-source
- mountPath: /app/EE/osm_ee/vnf
- - name: snmp-config-volume
- mountPath: /etc/snmp_exporter
- - name: vnf-mibs
- mountPath: /root/.snmp/mibs
- - name: vnf-generator
- mountPath: /app/vnf/generator
- volumes:
- - name: osm-ee-source
- configMap:
- name: {{ include "eechart.fullname" . }}
- - name: snmp-config-volume
- hostPath:
- path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- - name: vnf-mibs
- configMap:
- name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- - name: vnf-generator
- configMap:
- name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- - name: osm-ee
- hostPath:
- path: /var/lib/osm/osm/osm_osm_packages/_data
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ include "eechart.fullname" . }}
+spec:
+ serviceName: {{ include "eechart.fullname" . }}
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ vnf: {{ .Values.global.osm.vnf_id | lower}}
+ spec:
+ imagePullSecrets:
+ - name: regcred
+ serviceAccountName: {{ template "eechart.serviceAccountName" . }}
+ securityContext:
+ runAsUser: 0
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: grpc
+ containerPort: 50051
+ protocol: TCP
+ resources:
+ {{- toYaml .Values.resources | nindent 12 }}
+ volumeMounts:
+ - name: osm-ee
+ mountPath: /app/storage
+ - name: osm-ee-source
+ mountPath: /app/EE/osm_ee/vnf
+ - name: snmp-config-volume
+ mountPath: /etc/snmp_exporter
+ - name: vnf-mibs
+ mountPath: /root/.snmp/mibs
+ - name: vnf-generator
+ mountPath: /app/vnf/generator
+ volumes:
+ - name: osm-ee-source
+ configMap:
+ name: {{ include "eechart.fullname" . }}
+ - name: snmp-config-volume
+ hostPath:
+ path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
+ - name: vnf-mibs
+ configMap:
+ name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+ - name: vnf-generator
+ configMap:
+ name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+ - name: osm-ee
+ hostPath:
+ path: /var/lib/osm/osm/osm_osm_packages/_data
diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
index 7a2f8463..8b124995 100755
--- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
+++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml
@@ -1,62 +1,62 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- name: {{ include "eechart.fullname" . }}
- labels:
-{{ include "eechart.labels" . | indent 4 }}
-spec:
- serviceName: {{ include "eechart.fullname" . }}
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- template:
- metadata:
- labels:
- app.kubernetes.io/name: {{ include "eechart.name" . }}
- app.kubernetes.io/instance: {{ .Release.Name }}
- vnf: {{ .Values.global.osm.vnf_id | lower}}
- spec:
- imagePullSecrets:
- - name: regcred
- serviceAccountName: {{ template "eechart.serviceAccountName" . }}
- securityContext:
- runAsUser: 0
- containers:
- - name: {{ .Chart.Name }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
- imagePullPolicy: {{ .Values.image.pullPolicy }}
- ports:
- - name: grpc
- containerPort: 50051
- protocol: TCP
- resources:
- {{- toYaml .Values.resources | nindent 12 }}
- volumeMounts:
- - name: osm-ee
- mountPath: /app/storage
- - name: osm-ee-source
- mountPath: /app/EE/osm_ee/vnf
- - name: snmp-config-volume
- mountPath: /etc/snmp_exporter
- - name: vnf-mibs
- mountPath: /root/.snmp/mibs
- - name: vnf-generator
- mountPath: /app/vnf/generator
- volumes:
- - name: osm-ee-source
- configMap:
- name: {{ include "eechart.fullname" . }}
- - name: snmp-config-volume
- hostPath:
- path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- - name: vnf-mibs
- configMap:
- name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- - name: vnf-generator
- configMap:
- name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- - name: osm-ee
- hostPath:
- path: /var/lib/osm/osm/osm_osm_packages/_data
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ include "eechart.fullname" . }}
+ labels:
+{{ include "eechart.labels" . | indent 4 }}
+spec:
+ serviceName: {{ include "eechart.fullname" . }}
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "eechart.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ vnf: {{ .Values.global.osm.vnf_id | lower}}
+ spec:
+ imagePullSecrets:
+ - name: regcred
+ serviceAccountName: {{ template "eechart.serviceAccountName" . }}
+ securityContext:
+ runAsUser: 0
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: grpc
+ containerPort: 50051
+ protocol: TCP
+ resources:
+ {{- toYaml .Values.resources | nindent 12 }}
+ volumeMounts:
+ - name: osm-ee
+ mountPath: /app/storage
+ - name: osm-ee-source
+ mountPath: /app/EE/osm_ee/vnf
+ - name: snmp-config-volume
+ mountPath: /etc/snmp_exporter
+ - name: vnf-mibs
+ mountPath: /root/.snmp/mibs
+ - name: vnf-generator
+ mountPath: /app/vnf/generator
+ volumes:
+ - name: osm-ee-source
+ configMap:
+ name: {{ include "eechart.fullname" . }}
+ - name: snmp-config-volume
+ hostPath:
+ path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
+ - name: vnf-mibs
+ configMap:
+ name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
+ - name: vnf-generator
+ configMap:
+ name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
+ - name: osm-ee
+ hostPath:
+ path: /var/lib/osm/osm/osm_osm_packages/_data
--
GitLab