Merge remote-tracking branch 'origin/master' into azure-alternative-images

Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

.gitlab-ci.yml

@@ -10,17 +10,19 @@ publish-repository:
     - git submodule update
     - python3 -m pip install wheel pyang pyangbind
     - git clone https://osm.etsi.org/gerrit/osm/IM.git
+    - pip3 install -r IM/requirements.txt
     - pip3 install IM/
     - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
+    - pip3 install -r osmclient/requirements.txt
     - pip3 install osmclient/
     - rm -rf osmclient/ IM/
     - mv magma/* .
     - mv charm-packages/* .
-    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
-    - |
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
-          put -r vnf-catalog/* Testing
-        EOF
+    # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
+    # - |
+    #     sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
+    #       put -r vnf-catalog/* Testing
+    #     EOF
   rules:
     - if: '$CI_COMMIT_REF_PROTECTED == "true"'
       when: on_success
@@ -38,17 +40,19 @@ build-local-repository:
     - git submodule update
     - python3 -m pip install wheel pyang pyangbind
     - git clone https://osm.etsi.org/gerrit/osm/IM.git
+    - pip3 install -r IM/requirements.txt
     - pip3 install IM/
     - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
+    - pip3 install -r osmclient/requirements.txt
     - pip3 install osmclient/
     - rm -rf osmclient/ IM/
     - mv magma/* .
     - mv charm-packages/* .
-    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
-    - |
-        sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
-          put -r vnf-catalog/* Testing/Premerge
-        EOF
+    # - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
+    # - |
+    #     sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
+    #       put -r vnf-catalog/* Testing/Premerge
+    #     EOF
   rules:
     - if: '$CI_COMMIT_REF_PROTECTED == "false"'
       when: on_success

charm-packages/native_charm_centos_ns/native_charm_centos_nsd.yaml

+nsd:
+  nsd:
+  - description: NS with 1 VNF with cloudinit and charm for centos
+    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: native_charm_centos-vnf
+    id: native_charm_centos-ns
+    name: native_charm_centos-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: 'true'
+    - id: datanet
+    vnfd-id:
+    - native_charm_centos-vnf

charm-packages/native_charm_centos_vnf/charms/ops/simple/actions.yaml

+##
+# Copyright 2020 Canonical Ltd.
+# 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.
+##
+touch:
+  description: "Touch a file on the VNF."
+  params:
+    filename:
+      description: "The name of the file to touch."
+      type: string
+      default: ""
+  required:
+    - filename

charm-packages/native_charm_centos_vnf/charms/ops/simple/config.yaml

+##
+# Copyright 2020 Canonical Ltd.
+# 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.
+##
+options: {}
\ No newline at end of file

charm-packages/native_charm_centos_vnf/charms/ops/simple/metadata.yaml

+##
+# Copyright 2020 Canonical Ltd.
+# 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.
+##
+
+name: simple-native
+summary: A simple native charm
+description: |
+  Simple native charm
+series:
+  - bionic
+  - xenial
+  - focal
+  - centos7

charm-packages/native_charm_centos_vnf/charms/ops/simple/requirements.txt

+ops

charm-packages/native_charm_centos_vnf/charms/ops/simple/src/charm.py

+#!/usr/bin/env python3
+##
+# Copyright 2020 Canonical Ltd.
+# 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.
+##
+
+import sys
+import subprocess
+
+sys.path.append("lib")
+
+from ops.charm import CharmBase
+from ops.main import main
+from ops.model import ActiveStatus
+
+class MyNativeCharm(CharmBase):
+
+    def __init__(self, framework, key):
+        super().__init__(framework, key)
+
+        # Listen to charm events
+        self.framework.observe(self.on.config_changed, self.on_config_changed)
+        self.framework.observe(self.on.install, self.on_install)
+        self.framework.observe(self.on.start, self.on_start)
+
+        # Listen to the touch action event
+        self.framework.observe(self.on.touch_action, self.on_touch_action)
+
+    def on_config_changed(self, event):
+        """Handle changes in configuration"""
+        self.model.unit.status = ActiveStatus()
+
+    def on_install(self, event):
+        """Called when the charm is being installed"""
+        self.model.unit.status = ActiveStatus()
+
+    def on_start(self, event):
+        """Called when the charm is being started"""
+        self.model.unit.status = ActiveStatus()
+
+    def on_touch_action(self, event):
+        """Touch a file."""
+
+        filename = event.params["filename"]
+        try:
+            subprocess.run(["touch", filename], check=True)
+            event.set_results({"created": True, "filename": filename})
+        except subprocess.CalledProcessError as e:
+            event.fail("Action failed: {}".format(e))
+        self.model.unit.status = ActiveStatus()
+
+
+if __name__ == "__main__":
+    main(MyNativeCharm)
+

charm-packages/native_charm_centos_vnf/cloud_init/cloud-config.txt

+#cloud-config
+password: osm4u
+chpasswd: { expire: False }
+ssh_pwauth: True
+
+write_files:
+-   content: |
+        # My new helloworld file
+
+    owner: root:root
+    permissions: '0644'
+    path: /root/helloworld.txt
+
+#yum_repos:
+#    epel-release:
+#        baseurl: http://download.fedoraproject.org/pub/epel/7/$basearch
+#        enabled: true
+#        failovermethod: priority
+#        gpgcheck: true
+#        gpgkey: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+#        name: Extra Packages for Enterprise Linux 7 - Release
+
+packages:
+  - python3
+#  - python36-PyYAML

charm-packages/native_charm_centos_vnf/native_charm_centos_vnfd.yaml

+vnfd:
+  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+    data and another one for management
+  df:
+  - id: default-df
+    instantiation-level:
+    - id: default-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: mgmtVM
+    vdu-profile:
+    - id: mgmtVM
+      min-number-of-instances: 1
+    lcm-operations-configuration:
+      operate-vnf-op-config:
+        day1-2:
+        - config-access:
+            ssh-access:
+              default-user: centos
+              required: true
+          config-primitive:
+          - name: touch
+            execution-environment-ref: simple-ee
+            parameter:
+            - data-type: STRING
+              default-value: /home/centos/touched
+              name: filename
+          id: mgmtVM
+          execution-environment-list:
+          - id: simple-ee
+            juju:
+              charm: simple
+              proxy: false
+          initial-config-primitive:
+          - name: touch
+            execution-environment-ref: simple-ee
+            parameter:
+            - data-type: STRING
+              name: filename
+              value: /home/centos/first-touch
+            seq: 1
+  ext-cpd:
+  - id: vnf-mgmt-ext
+    int-cpd:
+      cpd: mgmtVM-eth0-int
+      vdu-id: mgmtVM
+  id: native_charm_centos-vnf
+  mgmt-cp: vnf-mgmt-ext
+  product-name: native_charm_centos-vnf
+  sw-image-desc:
+  - id: centos7
+    image: centos7
+    name: centos7
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: mgmtVM
+    int-cpd:
+    - id: mgmtVM-eth0-int
+      virtual-network-interface-requirement:
+      - name: mgmtVM-eth0
+        position: 1
+        virtual-interface:
+          type: PARAVIRT
+    name: mgmtVM
+    sw-image-desc: centos7
+    virtual-compute-desc: mgmtVM-compute
+    virtual-storage-desc:
+    - mgmtVM-storage
+  version: 1.0
+  virtual-compute-desc:
+  - id: mgmtVM-compute
+    virtual-cpu:
+      num-virtual-cpu: 1
+    virtual-memory:
+      size: 1.0
+  virtual-storage-desc:
+  - id: mgmtVM-storage
+    size-of-storage: 10

charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml

@@ -2,5 +2,5 @@ description: Squid Bundle
 bundle: kubernetes
 applications:
   nginx:
-    charm: '../charms/nginx-k8s'
+    charm: './charms/nginx-k8s'
     scale: 1