diff --git a/05-osm-usage.md b/05-osm-usage.md index dd05328a93d2db19cc1ffa7f698a9a0d27c18d6f..fd21917f61c75088dc84871f547dc402c661d7dc 100644 --- a/05-osm-usage.md +++ b/05-osm-usage.md @@ -1249,8 +1249,8 @@ KNFs can be on-boarded using Helm Charts or Juju Bundles. In the following secti Once the cluster is attached to your OSM, you can work with KNF in the same way as you do with any VNF. You can onboard them. For instance, you can use the example below of a KNF consisting of a single Kubernetes deployment unit based on OpenLDAP helm chart. ```bash -wget http://osm-download.etsi.org/ftp/Packages/hackfests/openldap_knf.tar.gz -wget http://osm-download.etsi.org/ftp/Packages/hackfests/openldap_ns.tar.gz +wget https://osm-download.etsi.org/ftp/Packages/examples/openldap_knf.tar.gz +wget https://osm-download.etsi.org/ftp/Packages/examples/openldap_ns.tar.gz osm nfpkg-create openldap_knf.tar.gz osm nspkg-create openldap_ns.tar.gz ``` @@ -1332,19 +1332,27 @@ osm k8scluster-delete cluster #### KNF Juju Bundle -This is an example on how to onboard a service that uses a Juju Bundle. For this example the service to be onboarded is a mediawiki that is comprised by a mariadb-k8s database and a mediawiki-k8s frontend. +This is an example on how to onboard a service that uses a Juju Bundle. In it, the service to be onboarded will be a Squid Web Proxy. The first thing you will need to do is to download the contents of the VNF and NS packages. To do so, you shall run: ```bash -wget http://osm-download.etsi.org/ftp/Packages/hackfests/mediawiki_cnf.tar.gz -wget http://osm-download.etsi.org/ftp/Packages/hackfests/mediawiki_cnf_ns.tar.gz -osm nfpkg-create mediawiki_cnf.tar.gz -osm nspkg-create mediawiki_cnf_ns.tar.gz +# For the VNF +wget https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages/-/archive/master/osm-packages-master.tar.gz?path=magma/squid_cnf -O squid_cnf.tar.gz +tar -xvf squid_cnf.tar.gz osm-packages-master-magma-squid_cnf/magma/squid_cnf/ --strip-components=2 + +# For the NS +wget https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages/-/archive/master/osm-packages-master.tar.gz?path=magma/squid_cnf_ns -O squid_cnf_ns.tar.gz +tar -xvf squid_cnf_ns.tar.gz osm-packages-master-magma-squid_cnf_ns/magma/squid_cnf_ns/ --strip-components=2 ``` -You can instantiate the Network Service: +After running these commands, you should end up with two new directories: `squid_cnf`, which corresponds to the VNF, and `squid_cnf_ns`, which corresponds to the corresponding NS. You may take a look at the analogous VNFD and NSD, in order to analyze and learn the attributes related to the creation of a KDU. You also might need to change the value of the `vim-network-name` attribute in the NSD (it must correspond to the management network you determined for the corresponding VIM, where you are running your K8s cluster). + +Finally, you can create the packages for the VNF and the NS, and upload them to OSM, as well as instantiating an NS from these packages: ```bash -osm ns-create --ns_name hf-k8s --nsd_name ubuntu-cnf-ns --vim_account +osm nfpkg-create squid_cnf +osm nspkg-create squid_cnf_ns + +osm ns-create --ns_name squid --nsd_name squid_cnf_ns --vim_account ``` To check the status of the deployment you can run the following command: