Update relations package and add cmr package

Related change in IM: https://osm.etsi.org/gerrit/#/c/osm/IM/+/11212/

charm-packages/cmr_relation_vnf/juju-bundles/charms/ops/provides-operator/requirements.txt

+ops >= 1.2.0

charm-packages/cmr_relation_vnf/juju-bundles/charms/ops/provides-operator/src/charm.py

+#!/usr/bin/env python3
+# Copyright 2021 David Garcia
+# See LICENSE file for licensing details.
+import logging
+
+from ops.charm import CharmBase
+from ops.main import main
+from ops.model import ActiveStatus
+
+logger = logging.getLogger(__name__)
+
+
+class ProvidesCharm(CharmBase):
+    """Charm the service."""
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.framework.observe(self.on.install, self._on_install)
+        self.framework.observe(
+            self.on.interface_relation_changed, self.on_interface_relation_changed
+        )
+
+    def _on_install(self, event):
+        self.unit.status = ActiveStatus()
+
+    def on_interface_relation_changed(self, event):
+        parameter = "Hello"
+        event.relation.data[self.model.unit]["parameter"] = parameter
+        self.unit.status = ActiveStatus("Parameter sent: {}".format(parameter))
+
+
+if __name__ == "__main__":
+    main(ProvidesCharm)

charm-packages/ns_relations_ns/ns_relations_nsd.yaml

@@ -30,8 +30,9 @@ nsd:
     ns-configuration:
       relation:
       - name: relation
-        entities:
-        - id: '1'
+        provider:
+          vnf-profile-id: '1'
           endpoint: interface
-        - id: '2'
+        requirer:
+          vnf-profile-id: '2'
           endpoint: interface

charm-packages/proxy_native_relation_ns/proxy_native_relation_nsd.yaml

-nsd:
-  nsd:
-  - description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
-    df:
-    - id: default-df
-      vnf-profile:
-      - id: '1'
-        virtual-link-connectivity:
-        - constituent-cpd-id:
-          - constituent-base-element-id: '1'
-            constituent-cpd-id: provides-mgmt-ext
-          - constituent-base-element-id: '1'
-            constituent-cpd-id: requires-mgmt-ext
-          virtual-link-profile-id: mgmtnet
-        vnfd-id: proxy_native_relation-vnf
-    id: proxy_native_relation-ns
-    name: proxy_native_relation-ns
-    version: '1.0'
-    virtual-link-desc:
-    - id: mgmtnet
-      mgmt-network: 'true'
-    vnfd-id:
-    - proxy_native_relation-vnf

charm-packages/proxy_native_relation_vnf/proxy_native_relation_vnfd.yaml

 vnfd:
-  description: A VNF consisting of 1 VDU connected to two external VL, and one for
+  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: simple_requires
-      - number-of-instances: 1
-        vdu-id: simple_provides
-    vdu-profile:
-    - id: simple_requires
-      min-number-of-instances: 1
-    - id: simple_provides
-      min-number-of-instances: 1
-    lcm-operations-configuration:
-      operate-vnf-op-config:
-        day1-2:
-        - config-access:
-            ssh-access:
-              default-user: ubuntu
-              required: true
-          config-primitive:
-          - name: touch
-            execution-environment-ref: simple-provides-proxy-ee
-            parameter:
-            - data-type: STRING
-              default-value: /home/ubuntu/touched
-              name: filename
-          id: proxy_native_relation-vnf
-          execution-environment-list:
-          - id: simple-provides-proxy-ee
-            juju:
-              charm: simple_provides_proxy
-              proxy: true
-            external-connection-point-ref: provides-mgmt-ext
-          initial-config-primitive:
-          - name: config
-            execution-environment-ref: simple-provides-proxy-ee
-            parameter:
-            - name: ssh-hostname
-              value: <rw_mgmt_ip>
-            - name: ssh-username
-              value: ubuntu
-            seq: 1
-          - name: touch
-            execution-environment-ref: simple-provides-proxy-ee
-            parameter:
-            - data-type: STRING
-              name: filename
-              value: /home/ubuntu/first-touch
-            seq: 2
-          relation:
-          - entities:
-            - endpoint: interface
+    - id: default-df
+      instantiation-level:
+        - id: default-instantiation-level
+          vdu-level:
+            - number-of-instances: 1
+              vdu-id: simple_requires
+            - number-of-instances: 1
+              vdu-id: simple_provides
+      vdu-profile:
+        - id: simple_requires
+          min-number-of-instances: 1
+        - id: simple_provides
+          min-number-of-instances: 1
+      lcm-operations-configuration:
+        operate-vnf-op-config:
+          day1-2:
+            - config-access:
+                ssh-access:
+                  default-user: ubuntu
+                  required: true
+              config-primitive:
+                - name: touch
+                  execution-environment-ref: simple-provides-proxy-ee
+                  parameter:
+                    - data-type: STRING
+                      default-value: /home/ubuntu/touched
+                      name: filename
               id: proxy_native_relation-vnf
-            - endpoint: interface
+              execution-environment-list:
+                - id: simple-provides-proxy-ee
+                  juju:
+                    charm: simple_provides_proxy
+                    proxy: true
+                  external-connection-point-ref: provides-mgmt-ext
+              initial-config-primitive:
+                - name: config
+                  execution-environment-ref: simple-provides-proxy-ee
+                  parameter:
+                    - name: ssh-hostname
+                      value: <rw_mgmt_ip>
+                    - name: ssh-username
+                      value: ubuntu
+                  seq: 1
+                - name: touch
+                  execution-environment-ref: simple-provides-proxy-ee
+                  parameter:
+                    - data-type: STRING
+                      name: filename
+                      value: /home/ubuntu/first-touch
+                  seq: 2
+              relation:
+                - entities:
+                    - endpoint: interface
+                      name: provides
+                    - endpoint: interface
+                      vdu-profile-id: simple_requires
+                      name: requires
+                  name: relation
+            - config-access:
+                ssh-access:
+                  default-user: ubuntu
+                  required: true
+              config-primitive:
+                - name: touch
+                  execution-environment-ref: simple-requires-ee
+                  parameter:
+                    - data-type: STRING
+                      default-value: /home/ubuntu/touched
+                      name: filename
               id: simple_requires
-            name: relation
-        - config-access:
-            ssh-access:
-              default-user: ubuntu
-              required: true
-          config-primitive:
-          - name: touch
-            execution-environment-ref: simple-requires-ee
-            parameter:
-            - data-type: STRING
-              default-value: /home/ubuntu/touched
-              name: filename
-          id: simple_requires
-          execution-environment-list:
-          - id: simple-requires-ee
-            juju:
-              charm: simple_requires
-              proxy: false
-            external-connection-point-ref: requires-mgmt-ext
-          initial-config-primitive:
-          - name: touch
-            execution-environment-ref: simple-requires-ee
-            parameter:
-            - data-type: STRING
-              name: filename
-              value: /home/ubuntu/first-touch
-            seq: 1
+              execution-environment-list:
+                - id: simple-requires-ee
+                  juju:
+                    charm: simple_requires
+                    proxy: false
+                  external-connection-point-ref: requires-mgmt-ext
+              initial-config-primitive:
+                - name: touch
+                  execution-environment-ref: simple-requires-ee
+                  parameter:
+                    - data-type: STRING
+                      name: filename
+                      value: /home/ubuntu/first-touch
+                  seq: 1
   ext-cpd:
-  - id: requires-mgmt-ext
-    int-cpd:
-      cpd: simple_requires-eth0-int
-      vdu-id: simple_requires
-  - id: provides-mgmt-ext
-    int-cpd:
-      cpd: simple_provides-eth0-int
-      vdu-id: simple_provides
+    - id: requires-mgmt-ext
+      int-cpd:
+        cpd: simple_requires-eth0-int
+        vdu-id: simple_requires
+    - id: provides-mgmt-ext
+      int-cpd:
+        cpd: simple_provides-eth0-int
+        vdu-id: simple_provides
   id: proxy_native_relation-vnf
   mgmt-cp: provides-mgmt-ext
   product-name: proxy_native_relation-vnf
   sw-image-desc:
-  - id: ubuntu18.04
-    image: ubuntu18.04
-    name: ubuntu18.04
+    - id: ubuntu18.04
+      image: ubuntu18.04
+      name: ubuntu18.04
   vdu:
-  - cloud-init-file: cloud-config.txt
-    id: simple_requires
-    int-cpd:
-    - id: simple_requires-eth0-int
-      virtual-network-interface-requirement:
-      - name: simple_requires-eth0
-        position: 1
-        virtual-interface:
-          type: PARAVIRT
-    name: simple_requires
-    sw-image-desc: ubuntu18.04
-    virtual-compute-desc: simple_requires-compute
-    virtual-storage-desc:
-    - simple_requires-storage
-  - cloud-init-file: cloud-config.txt
-    id: simple_provides
-    int-cpd:
-    - id: simple_provides-eth0-int
-      virtual-network-interface-requirement:
-      - name: simple_provides-eth0
-        position: 1
-        virtual-interface:
-          type: PARAVIRT
-    name: simple_provides
-    sw-image-desc: ubuntu18.04
-    virtual-compute-desc: simple_provides-compute
-    virtual-storage-desc:
-    - simple_provides-storage
+    - cloud-init-file: cloud-config.txt
+      id: simple_requires
+      int-cpd:
+        - id: simple_requires-eth0-int
+          virtual-network-interface-requirement:
+            - name: simple_requires-eth0
+              position: 1
+              virtual-interface:
+                type: PARAVIRT
+      name: simple_requires
+      sw-image-desc: ubuntu18.04
+      virtual-compute-desc: simple_requires-compute
+      virtual-storage-desc:
+        - simple_requires-storage
+    - cloud-init-file: cloud-config.txt
+      id: simple_provides
+      int-cpd:
+        - id: simple_provides-eth0-int
+          virtual-network-interface-requirement:
+            - name: simple_provides-eth0
+              position: 1
+              virtual-interface:
+                type: PARAVIRT
+      name: simple_provides
+      sw-image-desc: ubuntu18.04
+      virtual-compute-desc: simple_provides-compute
+      virtual-storage-desc:
+        - simple_provides-storage
   version: 1.0
   virtual-compute-desc:
-  - id: simple_requires-compute
-    virtual-cpu:
-      num-virtual-cpu: 1
-    virtual-memory:
-      size: 1.0
-  - id: simple_provides-compute
-    virtual-cpu:
-      num-virtual-cpu: 1
-    virtual-memory:
-      size: 1.0
+    - id: simple_requires-compute
+      virtual-cpu:
+        num-virtual-cpu: 1
+      virtual-memory:
+        size: 1.0
+    - id: simple_provides-compute
+      virtual-cpu:
+        num-virtual-cpu: 1
+      virtual-memory:
+        size: 1.0
   virtual-storage-desc:
-  - id: simple_requires-storage
-    size-of-storage: 10
-  - id: simple_provides-storage
-    size-of-storage: 10
+    - id: simple_requires-storage
+      size-of-storage: 10
+    - id: simple_provides-storage
+      size-of-storage: 10

charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml

@@ -20,12 +20,13 @@ vnfd:
         day1-2:
         - id: vnf_relations-vnf
           relation:
-          - entities:
-            - endpoint: interface
-              id: simple_provides
-            - endpoint: interface
-              id: simple_requires
-            name: relation
+          - name: relation
+            provider:
+              endpoint: interface
+              vdu-profile-id: simple_provides
+            requirer:
+              endpoint: interface
+              vdu-profile-id: simple_requires
         - config-access:
             ssh-access:
               default-user: ubuntu

magma/hackfest_magma-agw-enb_vnfd/magma-agw-enb_vnfd.yaml

@@ -54,9 +54,11 @@ vnfd:
           relation:
           - entities:
             - endpoint: mme
-              id: srsLTE-vdu
+              vdu-profile-id: srsLTE-vdu
+              name: requirer
             - endpoint: agw
-              id: magma-agw-vdu
+              vdu-profile-id: magma-agw-vdu
+              name: provider
             name: agw
         - config-access:
             ssh-access: