From 451d256f573e0dd5e804b82c39d0ccc8ad5b0478 Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Thu, 28 Apr 2022 12:33:06 +0000 Subject: [PATCH 1/7] Autohealing descriptor packages --- autoheal_ns/autoheal_nsd.yaml | 23 ++++++++++ autoheal_vnf/autoheal_vnfd.yaml | 75 +++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100755 autoheal_ns/autoheal_nsd.yaml create mode 100755 autoheal_vnf/autoheal_vnfd.yaml diff --git a/autoheal_ns/autoheal_nsd.yaml b/autoheal_ns/autoheal_nsd.yaml new file mode 100755 index 00000000..67233e8e --- /dev/null +++ b/autoheal_ns/autoheal_nsd.yaml @@ -0,0 +1,23 @@ +nsd: + nsd: + - description: cirros_nsd Network Service + designer: TATA ELXSI + df: + - id: default-df + vnf-profile: + - id: '1' + vnfd-id: cirros_vnfd + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: '1' + constituent-cpd-id: vnf-cp0-ext + virtual-link-profile-id: mgmt + id: cirros_nsd + name: cirros_nsd + version: '1.0' + virtual-link-desc: + - id: mgmt + mgmt-network: 'true' + #vim-network-name: management + vnfd-id: + - cirros_vnfd diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml new file mode 100755 index 00000000..875009c6 --- /dev/null +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -0,0 +1,75 @@ +# Copyright 2020 TATA ELXSI +# +# 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. +vnfd: + description: cirros VNFD package enabled with Autohealing + df: + - id: default-df + instantiation-level: + - id: default-instantiation-level + vdu-level: + - number-of-instances: 1 + vdu-id: cirros_vnfd-VM + vdu-profile: + - id: cirros_vnfd-VM + min-number-of-instances: 1 + max-number-of-instances: 2 + healing-aspect: + - id: cirros_vnfd-VM_autoheal + healing-policy: + - vdu-id: cirros_vnfd-VM + event-name: heal-alarm + recovery-type: automatic + action-on-recovery: REDEPLOY_ONLY + cooldown-time: 180 + day1: false + ext-cpd: + - id: vnf-cp0-ext + int-cpd: + cpd: vdu-eth0-int + vdu-id: cirros_vnfd-VM + id: cirros_vnfd + mgmt-cp: vnf-cp0-ext + product-name: cirros_vnfd + provider: TATA ELXSI + sw-image-desc: + - id: cirros-0.3.5-x86_64-disk + image: cirros-0.3.5-x86_64-disk + name: cirros-0.3.5-x86_64-disk + vdu: + - description: cirros_vnfd-VM + id: cirros_vnfd-VM + int-cpd: + - id: vdu-eth0-int + virtual-network-interface-requirement: + - name: eth0 + position: 1 + virtual-interface: + type: PARAVIRT + name: cirros_vnfd-VM + sw-image-desc: cirros-0.3.5-x86_64-disk + virtual-compute-desc: cirros_vnfd-VM-compute + virtual-storage-desc: + - cirros_vnfd-VM-storage + version: '1.0' + virtual-compute-desc: + - id: cirros_vnfd-VM-compute + virtual-cpu: + num-virtual-cpu: 1 + virtual-memory: + size: 1 + virtual-storage-desc: + - id: cirros_vnfd-VM-storage + size-of-storage: 12 -- GitLab From 36583bc605ae91f9f5a1aa8321d6ebcf5d3265ee Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Fri, 29 Apr 2022 12:04:45 +0000 Subject: [PATCH 2/7] Update autoheal_ns/autoheal_nsd.yaml, autoheal_vnf/autoheal_vnfd.yaml files --- autoheal_ns/autoheal_nsd.yaml | 8 ++++---- autoheal_vnf/autoheal_vnfd.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoheal_ns/autoheal_nsd.yaml b/autoheal_ns/autoheal_nsd.yaml index 67233e8e..b7b78ad1 100755 --- a/autoheal_ns/autoheal_nsd.yaml +++ b/autoheal_ns/autoheal_nsd.yaml @@ -5,19 +5,19 @@ nsd: df: - id: default-df vnf-profile: - - id: '1' + - id: cirros-basic-1 vnfd-id: cirros_vnfd virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: '1' + - constituent-base-element-id: cirros-basic-1 constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmt id: cirros_nsd name: cirros_nsd - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmt - mgmt-network: 'true' + mgmt-network: true #vim-network-name: management vnfd-id: - cirros_vnfd diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml index 875009c6..a56374c4 100755 --- a/autoheal_vnf/autoheal_vnfd.yaml +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -63,7 +63,7 @@ vnfd: virtual-compute-desc: cirros_vnfd-VM-compute virtual-storage-desc: - cirros_vnfd-VM-storage - version: '1.0' + version: 1.0 virtual-compute-desc: - id: cirros_vnfd-VM-compute virtual-cpu: -- GitLab From 89a5d95554fa65aaa78e5211428b78e7db3b1c9e Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Thu, 19 May 2022 08:16:02 +0000 Subject: [PATCH 3/7] Update autoheal_vnf/autoheal_vnfd.yaml --- autoheal_vnf/autoheal_vnfd.yaml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml index a56374c4..45876f20 100755 --- a/autoheal_vnf/autoheal_vnfd.yaml +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -1,18 +1,3 @@ -# Copyright 2020 TATA ELXSI -# -# 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. vnfd: description: cirros VNFD package enabled with Autohealing df: -- GitLab From aea3def3f7461c32dfd8edea4d75257769a2aaf6 Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Fri, 20 May 2022 11:53:34 +0000 Subject: [PATCH 4/7] Update autoheal_vnf/autoheal_vnfd.yaml --- autoheal_vnf/autoheal_vnfd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml index 45876f20..34ddaeaf 100755 --- a/autoheal_vnf/autoheal_vnfd.yaml +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -30,9 +30,9 @@ vnfd: product-name: cirros_vnfd provider: TATA ELXSI sw-image-desc: - - id: cirros-0.3.5-x86_64-disk - image: cirros-0.3.5-x86_64-disk - name: cirros-0.3.5-x86_64-disk + - id: ubuntu18.04 + image: ubuntu18.04 + name: ubuntu18.04 vdu: - description: cirros_vnfd-VM id: cirros_vnfd-VM @@ -44,7 +44,7 @@ vnfd: virtual-interface: type: PARAVIRT name: cirros_vnfd-VM - sw-image-desc: cirros-0.3.5-x86_64-disk + sw-image-desc: ubuntu18.04 virtual-compute-desc: cirros_vnfd-VM-compute virtual-storage-desc: - cirros_vnfd-VM-storage -- GitLab From c698b330f24a67f5a26a19610009666b272bf06f Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Wed, 25 May 2022 19:37:44 +0000 Subject: [PATCH 5/7] Update autoheal_vnf/autoheal_vnfd.yaml --- autoheal_vnf/autoheal_vnfd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml index 34ddaeaf..bd87c609 100755 --- a/autoheal_vnf/autoheal_vnfd.yaml +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -30,9 +30,9 @@ vnfd: product-name: cirros_vnfd provider: TATA ELXSI sw-image-desc: - - id: ubuntu18.04 - image: ubuntu18.04 - name: ubuntu18.04 + - id: ubuntu20.04 + image: ubuntu20.04 + name: ubuntu20.04 vdu: - description: cirros_vnfd-VM id: cirros_vnfd-VM @@ -44,7 +44,7 @@ vnfd: virtual-interface: type: PARAVIRT name: cirros_vnfd-VM - sw-image-desc: ubuntu18.04 + sw-image-desc: ubuntu20.04 virtual-compute-desc: cirros_vnfd-VM-compute virtual-storage-desc: - cirros_vnfd-VM-storage -- GitLab From 31a5d12fb7cd95bb6ad0752a0518c54c67389245 Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Tue, 14 Jun 2022 07:34:36 +0000 Subject: [PATCH 6/7] Update autoheal_ns/autoheal_nsd.yaml --- autoheal_ns/autoheal_nsd.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autoheal_ns/autoheal_nsd.yaml b/autoheal_ns/autoheal_nsd.yaml index b7b78ad1..cdb7c9a5 100755 --- a/autoheal_ns/autoheal_nsd.yaml +++ b/autoheal_ns/autoheal_nsd.yaml @@ -1,23 +1,23 @@ nsd: nsd: - - description: cirros_nsd Network Service + - description: autoheal_nsd Network Service designer: TATA ELXSI df: - id: default-df vnf-profile: - - id: cirros-basic-1 - vnfd-id: cirros_vnfd + - id: autoheal-basic-1 + vnfd-id: autoheal_vnfd virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: cirros-basic-1 + - constituent-base-element-id: autoheal-basic-1 constituent-cpd-id: vnf-cp0-ext virtual-link-profile-id: mgmt - id: cirros_nsd - name: cirros_nsd + id: autoheal_nsd + name: autoheal_nsd version: 1.0 virtual-link-desc: - id: mgmt mgmt-network: true #vim-network-name: management vnfd-id: - - cirros_vnfd + - autoheal_vnfd -- GitLab From d3659f2899028255df3295be1066d9622b92dac5 Mon Sep 17 00:00:00 2001 From: dhanasekaran Date: Tue, 14 Jun 2022 07:41:37 +0000 Subject: [PATCH 7/7] Update autoheal_vnf/autoheal_vnfd.yaml --- autoheal_vnf/autoheal_vnfd.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/autoheal_vnf/autoheal_vnfd.yaml b/autoheal_vnf/autoheal_vnfd.yaml index bd87c609..bb231081 100755 --- a/autoheal_vnf/autoheal_vnfd.yaml +++ b/autoheal_vnf/autoheal_vnfd.yaml @@ -1,20 +1,20 @@ vnfd: - description: cirros VNFD package enabled with Autohealing + description: autoheal VNFD package enabled with Autohealing df: - id: default-df instantiation-level: - id: default-instantiation-level vdu-level: - number-of-instances: 1 - vdu-id: cirros_vnfd-VM + vdu-id: autoheal_vnfd-VM vdu-profile: - - id: cirros_vnfd-VM + - id: autoheal_vnfd-VM min-number-of-instances: 1 max-number-of-instances: 2 healing-aspect: - - id: cirros_vnfd-VM_autoheal + - id: autoheal_vnfd-VM_autoheal healing-policy: - - vdu-id: cirros_vnfd-VM + - vdu-id: autoheal_vnfd-VM event-name: heal-alarm recovery-type: automatic action-on-recovery: REDEPLOY_ONLY @@ -24,18 +24,18 @@ vnfd: - id: vnf-cp0-ext int-cpd: cpd: vdu-eth0-int - vdu-id: cirros_vnfd-VM - id: cirros_vnfd + vdu-id: autoheal_vnfd-VM + id: autoheal_vnfd mgmt-cp: vnf-cp0-ext - product-name: cirros_vnfd + product-name: autoheal_vnfd provider: TATA ELXSI sw-image-desc: - id: ubuntu20.04 image: ubuntu20.04 name: ubuntu20.04 vdu: - - description: cirros_vnfd-VM - id: cirros_vnfd-VM + - description: autoheal_vnfd-VM + id: autoheal_vnfd-VM int-cpd: - id: vdu-eth0-int virtual-network-interface-requirement: @@ -43,18 +43,18 @@ vnfd: position: 1 virtual-interface: type: PARAVIRT - name: cirros_vnfd-VM + name: autoheal_vnfd-VM sw-image-desc: ubuntu20.04 - virtual-compute-desc: cirros_vnfd-VM-compute + virtual-compute-desc: autoheal_vnfd-VM-compute virtual-storage-desc: - - cirros_vnfd-VM-storage + - autoheal_vnfd-VM-storage version: 1.0 virtual-compute-desc: - - id: cirros_vnfd-VM-compute + - id: autoheal_vnfd-VM-compute virtual-cpu: num-virtual-cpu: 1 virtual-memory: size: 1 virtual-storage-desc: - - id: cirros_vnfd-VM-storage + - id: autoheal_vnfd-VM-storage size-of-storage: 12 -- GitLab