From 71472f286c7b69d87110910d920658e3fb98bc31 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 16 Jul 2020 12:38:02 +0200 Subject: [PATCH] removed root yang namespace in first line of descriptors; replaced nbsp by spaces; unquoted true Signed-off-by: garciadeblas --- hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml | 4 ++-- hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml | 2 +- hackfest_proxycharm_vnf/charms/simple/README.md | 6 +++--- hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml | 4 ++-- magma/build_infra.sh | 2 +- simple_ee_ns/simple_ee_nsd.yaml | 2 +- simple_ee_vnf/simple_ee_vnfd.yaml | 2 +- simple_nopasswd_ns/simple_nopasswd_nsd.yaml | 4 ++-- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 2 +- ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml | 4 ++-- ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml b/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml index e5e51a6c..42743184 100644 --- a/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml +++ b/hackfest_k8sproxycharm_ns/hackfest_k8sproxycharm_nsd.yaml @@ -1,4 +1,4 @@ -nsd:nsd-catalog: +nsd-catalog: nsd: - id: hackfest_k8sproxycharm-ns name: hackfest_k8sproxycharm-ns @@ -16,7 +16,7 @@ nsd:nsd-catalog: name: mgmtnet short-name: mgmtnet type: ELAN - mgmt-network: 'true' + mgmt-network: true vim-network-name: PUBLIC vnfd-connection-point-ref: - vnfd-id-ref: hackfest_k8sproxycharm-vnf diff --git a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml index 831a404e..41a9c312 100644 --- a/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml +++ b/hackfest_k8sproxycharm_vnf/hackfest_k8sproxycharm_vnfd.yaml @@ -1,4 +1,4 @@ -vnfd:vnfd-catalog: +vnfd-catalog: vnfd: - id: hackfest_k8sproxycharm-vnf name: hackfest_k8sproxycharm-vnf diff --git a/hackfest_proxycharm_vnf/charms/simple/README.md b/hackfest_proxycharm_vnf/charms/simple/README.md index c832cac2..e4d801cf 100644 --- a/hackfest_proxycharm_vnf/charms/simple/README.md +++ b/hackfest_proxycharm_vnf/charms/simple/README.md @@ -252,11 +252,11 @@ Copy the combined charm into the `charm` directory of your [VNF package]: ``` ├── charm -│   └── myvnf +│ └── myvnf ├── cloud_init -│   └── myvnf_cloud_init.cfg +│ └── myvnf_cloud_init.cfg ├── icons -│   └── myvnf_logo.png +│ └── myvnf_logo.png └── myvnf_vnfd.yaml ``` diff --git a/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml index ae146bdf..ebb6faef 100644 --- a/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml +++ b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml @@ -1,4 +1,4 @@ -nsd:nsd-catalog: +nsd-catalog: nsd: - id: hackfest-simple-k8s-ns name: hackfest-simple-k8s-ns @@ -14,7 +14,7 @@ nsd:nsd-catalog: name: mgmtnet short-name: mgmtnet type: ELAN - mgmt-network: 'true' + mgmt-network: true vim-network-name: mgmt vnfd-connection-point-ref: - vnfd-id-ref: hackfest-simple-k8s-vnf diff --git a/magma/build_infra.sh b/magma/build_infra.sh index 77626984..c7d882e0 100755 --- a/magma/build_infra.sh +++ b/magma/build_infra.sh @@ -21,6 +21,6 @@ osm pdu-create --descriptor_file pdu.yaml # Add K8sCluster to first VIM osm k8scluster-add --creds ~/kube.yaml --version '1.15' --vim etsi-openstack --description "My K8s cluster" --k8s-nets '{"net1": "osm-ext"}' etsi-k8scluster -# Add SDN Controller +# Add SDN Controller #osm sdnc-create --name onos01 --type onos_vpls --url http://172.21.248.19:8181 --user karaf --password karaf #osm vim-update whitecloud_highcost_sriov --sdn_controller onos02 --sdn_port_mapping sdn_port_mapping.yaml \ No newline at end of file diff --git a/simple_ee_ns/simple_ee_nsd.yaml b/simple_ee_ns/simple_ee_nsd.yaml index 21e8af13..8809f107 100644 --- a/simple_ee_ns/simple_ee_nsd.yaml +++ b/simple_ee_ns/simple_ee_nsd.yaml @@ -1,4 +1,4 @@ -nsd:nsd-catalog: +nsd-catalog: nsd: - id: simple_ee-ns name: simple_ee-ns diff --git a/simple_ee_vnf/simple_ee_vnfd.yaml b/simple_ee_vnf/simple_ee_vnfd.yaml index 9f669473..d1aa5c01 100644 --- a/simple_ee_vnf/simple_ee_vnfd.yaml +++ b/simple_ee_vnf/simple_ee_vnfd.yaml @@ -1,4 +1,4 @@ -vnfd:vnfd-catalog: +vnfd-catalog: vnfd: - id: simple_ee-vnf name: simple_ee-vnf diff --git a/simple_nopasswd_ns/simple_nopasswd_nsd.yaml b/simple_nopasswd_ns/simple_nopasswd_nsd.yaml index a9bf29ee..d4e111ff 100644 --- a/simple_nopasswd_ns/simple_nopasswd_nsd.yaml +++ b/simple_nopasswd_ns/simple_nopasswd_nsd.yaml @@ -1,4 +1,4 @@ -nsd:nsd-catalog: +nsd-catalog: nsd: - id: simple_nopasswd-ns name: simple_nopasswd-ns @@ -16,7 +16,7 @@ nsd:nsd-catalog: name: mgmtnet short-name: mgmtnet type: ELAN - mgmt-network: 'true' + mgmt-network: true vim-network-name: mgmt vnfd-connection-point-ref: - vnfd-id-ref: simple_nopasswd-vnf diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index c4a26963..be3a2d41 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -1,4 +1,4 @@ -vnfd:vnfd-catalog: +vnfd-catalog: vnfd: - connection-point: - id: vnf-mgmt diff --git a/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml b/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml index 56da9c7a..fab7df60 100644 --- a/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml +++ b/ubuntu_cloudinit_ns/ubuntu_cloudinit_nsd.yaml @@ -1,4 +1,4 @@ -nsd:nsd-catalog: +nsd-catalog: nsd: - id: ubuntu_cloudinit-ns name: ubuntu_cloudinit-ns @@ -18,7 +18,7 @@ nsd:nsd-catalog: name: mgmtnet short-name: mgmtnet type: ELAN - mgmt-network: 'true' + mgmt-network: true # vim-network-name: vnfd-connection-point-ref: - member-vnf-index-ref: 1 diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml index 8136f659..566f2819 100644 --- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml +++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml @@ -1,4 +1,4 @@ -vnfd:vnfd-catalog: +vnfd-catalog: vnfd: - id: ubuntu_cloudinit-vnf name: ubuntu_cloudinit-vnf -- GitLab