Update pip requirements 44/12244/1 master v12.0
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 24 Jun 2022 15:35:45 +0000 (17:35 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 24 Jun 2022 15:35:45 +0000 (17:35 +0200)
Change-Id: I5861a620eb42d5d50e2e3e8ef1f339ec1f85f485
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Dockerfile
models/augments/healing.yang [new file with mode: 0644]
requirements-test.txt
requirements.txt
tests/examples/cirros_heal_vnfd_sol006.yaml [new file with mode: 0644]
tox.ini

index a1dc352..3ca4992 100644 (file)
@@ -42,6 +42,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
 RUN python3 -m easy_install pip==21.3.1
 RUN pip install tox==3.24.5
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
                                               openjdk-8-jdk maven
 RUN update-java-alternatives --set /usr/lib/jvm/java-1.8.0-openjdk-amd64
diff --git a/models/augments/healing.yang b/models/augments/healing.yang
new file mode 100644 (file)
index 0000000..8eec9d1
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+  Copyright 2020 Whitestack LLC
+
+  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.
+*/
+
+module healing {
+    yang-version 1.1;
+    namespace "urn:etsi:osm:yang:augments:healing";
+    prefix "healing";
+
+    import etsi-nfv-vnfd {
+        prefix vnfd;
+    }
+
+    typedef recovery-actions {
+        type enumeration {
+
+            enum REDEPLOY_ONLY {
+                value 1;
+            }
+
+            enum REBOOT {
+                value 2;
+            }
+
+            enum REBOOT_THEN_REDEPLOY {
+                value 3;
+            }
+        }
+    }
+
+
+    typedef recovery-type {
+        type enumeration {
+
+            enum manual {
+                value 1;
+            }
+
+            enum automatic {
+                value 2;
+            }
+        }
+    }
+
+    grouping extended-healing {
+        list healing-aspect {
+            key "id";
+
+            description
+              "The healing aspects supported by this DF of the VNF.
+               healingAspect shall be present if the VNF supports
+               healing.";
+
+            leaf id {
+                type string;
+                description
+                  "Unique identifier of this aspect in the VNFD.";
+            }
+
+            list healing-policy {
+
+                key "vdu-id";
+
+                leaf vdu-id {
+                    description
+                      "Identifier of vdu";
+                    type string;
+                }
+
+                leaf event-name {
+                    description
+                      "Describing the event name for healing";
+                    type string;
+                }
+
+                leaf recovery-type {
+                    description
+                      "Type of healing recovery";
+                    type recovery-type;
+                }
+
+                leaf action-on-recovery {
+                    description
+                      "Recovery actions for healing";
+                    type recovery-actions;
+                }
+
+                leaf cooldown-time {
+                    description
+                      "The duration after a healing action has been
+                      triggered, for which there will be no further optional";
+                    type uint32;
+                    mandatory true;
+                }
+
+                leaf day1 {
+                    description
+                      "Specifies if the day1 operations can be applied";
+                    type boolean;
+                    default false;
+                }
+            }
+        }
+
+    }
+    augment "/vnfd:vnfd/vnfd:df" {
+        uses extended-healing;
+    }
+
+}
index e355475..40c7f11 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-coverage==6.2
+coverage==6.4.1
     # via
     #   -r requirements-test.in
     #   nose2
-nose2==0.10.0
+nose2==0.11.0
     # via -r requirements-test.in
 six==1.16.0
     # via nose2
index 2901c33..9572169 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #######################################################################################
-bitarray==2.3.5
+bitarray==2.5.1
     # via pyangbind
 enum34==1.1.10
     # via pyangbind
-lxml==4.7.1
+lxml==4.9.0
     # via
     #   pyang
     #   pyangbind
-pyang==2.5.2
+pyang==2.5.3
     # via
     #   -r requirements.in
     #   pyangbind
@@ -30,7 +30,7 @@ pyangbind==0.8.1
     # via -r requirements.in
 pyyaml==5.4.1
     # via -r requirements.in
-regex==2021.11.10
+regex==2022.6.2
     # via pyangbind
 six==1.16.0
     # via pyangbind
diff --git a/tests/examples/cirros_heal_vnfd_sol006.yaml b/tests/examples/cirros_heal_vnfd_sol006.yaml
new file mode 100644 (file)
index 0000000..253dc66
--- /dev/null
@@ -0,0 +1,80 @@
+#  Copyright 2020 Whitestack LLC
+#
+#  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:
+  id: cirros_heal_vnfd
+  product-name: cirros_heal_vnf
+  description: Simple heal VNF example with a cirros
+  provider: OSM
+  version: "1.0"
+  mgmt-cp: eth0-ext
+
+  virtual-compute-desc:
+    - id: cirros_heal_vnfd-VM-compute
+      virtual-cpu:
+        num-virtual-cpu: 1
+      virtual-memory:
+        size: 0.25 # Memory size in GB
+
+  virtual-storage-desc:
+    - id: cirros_heal_vnfd-VM-storage
+      size-of-storage: 2
+
+  sw-image-desc:
+    - id: cirros034
+      name: cirros034
+      image: cirros034
+
+  vdu:
+    - id: cirros_heal_vnfd-VM
+      name: cirros_heal_vnfd-VM
+      description: cirros_heal_vnfd-VM
+      virtual-compute-desc: cirros_heal_vnfd-VM-compute
+      virtual-storage-desc:
+        - cirros_heal_vnfd-VM-storage
+      sw-image-desc: cirros034
+      int-cpd:
+        - id: eth0-int
+          virtual-network-interface-requirement:
+            - name: eth0
+              virtual-interface:
+                type: VIRTIO
+                bandwidth: "0"
+                vpci: 0000:00:0a.0
+
+  df:
+    - id: default-df
+      vdu-profile:
+        - id: cirros_heal_vnfd-VM
+          min-number-of-instances: 1
+      instantiation-level:
+        - id: default-instantiation-level
+          vdu-level:
+            - vdu-id: cirros_heal_vnfd-VM
+              number-of-instances: 1
+      healing-aspect:
+      -   id: cirros_heal_vnfd-VM_autoheal
+          healing-policy:
+          - vdu-id: cirros_heal_vnfd-VM
+            event-name: heal-alarm
+            recovery-type: automatic
+            action-on-recovery: REDEPLOY_ONLY
+            cooldown-time: 180
+            day1: false
+  ext-cpd:
+    - id: eth0-ext
+      int-cpd: # Connection to int-cpd
+        vdu-id: cirros_heal_vnfd-VM
+        cpd: eth0-int
diff --git a/tox.ini b/tox.ini
index f1cf7c9..4a2494a 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,7 @@ commands =
 
 #######################################################################################
 [testenv:pip-compile]
-deps =  pip-tools==6.4.0
+deps =  pip-tools==6.6.2
 skip_install = true
 whitelist_externals = bash
         [