Merge pull request #4 from 5g-mobility/dev

Merge w/ Main

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "vnf-charm/charms/sshproxy/mod/operator"]
+	path = vnf-charm/charms/sshproxy/mod/operator
+	url = https://github.com/canonical/operator
+[submodule "vnf-charm/charms/sshproxy/mod/charms.osm"]
+	path = vnf-charm/charms/sshproxy/mod/charms.osm
+	url = https://github.com/charmed-osm/charms.osm

README.md

@@ -4,19 +4,19 @@ There are 2 NSs, one for the static services i.e, the services that will always
 
 ## How to Run
 
-To run the system, [OSM client](https://osm.etsi.org/wikipub/index.php/OSM_client) must be installed and updated.
+To prepare the system, [OSM client](https://osm.etsi.org/wikipub/index.php/OSM_client) must be installed and updated and have a [VIM](https://osm.etsi.org/docs/user-guide/04-vim-setup.html) and [OSM](https://osm.etsi.org/) configured.
 
 That said, the steps are as follows:
 
 1. If you do not have the _tar.gz_ of each NS and VNF configuration directory, you need to do the following
 
-     - For each NS and VNF configuration directory do the following
+     - For each NS and VNF configuration:
 
     ```
     $ tar -czvf <name_of_NS_or_VNF_configuration_directory>.tar.gz <name_of_NS_or_VNF_configuration_directory>/
     ```
 
-    This will create the a single file with the collection of configuration files wrapped up in it
+    This will create a single file with the collection of configuration files wrapped up in it
 
 2. Do the onboarding of each VNF. To do this, do the following for each _tar.gz_ of the VNFs configuration files:
 

build_cv_image_ns/build_cv_image_nsd.yaml

@@ -0,0 +1,22 @@
+nsd:
+  nsd:
+  - description: Non Static NS with a single VNF and VL for 5G Mobility
+    df:
+    - id: non-static-5g-mobility-df
+      vnf-profile:
+      - id: '1'
+        virtual-link-connectivity:
+        - constituent-cpd-id:
+          - constituent-base-element-id: '1'
+            constituent-cpd-id: vnf-cp0-ext
+          virtual-link-profile-id: mgmtnet
+        vnfd-id: non_static_5g_mobility-vnf
+    id: non_static_5g_mobility-ns
+    name: non_static_5g_mobility-ns
+    version: '1.0'
+    virtual-link-desc:
+    - id: mgmtnet
+      mgmt-network: true
+      vim-network-name: proj_net
+    vnfd-id:
+    - non_static_5g_mobility-vnf

build_cv_image_ns/checksums.txt

@@ -0,0 +1,2 @@
+4aab2a3d392795aba9f26cd65a1a3a6c	hackfest_basic_ns/hackfest_basic_nsd.yaml
+bc681c5a4c3cdc09c013df2d2239f3d2	hackfest_basic_ns/icons/osm.png

build_cv_image_vnf/build_cv_image_vnfd.yaml

@@ -0,0 +1,91 @@
+vnfd:
+  description: Non Static VNF descriptor w/ one VDU
+  df:
+  - id: non-static-5g-mobility-df
+    instantiation-level:
+    - id: non_static_5g_mobility-instantiation-level
+      vdu-level:
+      - number-of-instances: 1
+        vdu-id: non_static_5g_mobility-VM
+    vdu-profile:
+    - id: non_static_5g_mobility-VM
+      min-number-of-instances: 1
+    lcm-operations-configuration:
+      operate-vnf-op-config:
+        day1-2:
+        - id: non_static_5g_mobility-vnf
+          execution-environment-list:
+          - id: sshproxy-ee
+            juju:
+              charm: sshproxy
+          config-access:
+            ssh-access:
+              default-user: ubuntu
+              required: true
+          initial-config-primitive:
+          - name: config
+            execution-environment-ref: sshproxy-ee
+            parameter:
+            - name: ssh-hostname
+              value: <rw_mgmt_ip>
+            - name: ssh-username
+              value: ubuntu
+            - name: ssh-password
+              value: pi-5g-lei
+            seq: 1
+          - name: start
+            execution-environment-ref: sshproxy-ee
+            seq : 2
+          - name: clone-github-repository
+            execution-environment-ref: sshproxy-ee
+            parameter:
+            - data-type: STRING
+              name: repository-url
+              value: https://github.com/5g-mobility/computer-vision.git
+            - data-type: STRING
+              name: app-name
+              value: cv_app
+            seq: 3
+          - name: build-app
+            execution-environment-ref: sshproxy-ee
+            parameter:
+            - data-type: STRING
+              name: app-name
+              value: cv_app
+            seq: 4
+  ext-cpd:
+  - id: vnf-cp0-ext
+    int-cpd:
+      cpd: vdu-eth0-int
+      vdu-id: non_static_5g_mobility-VM
+  id: non_static_5g_mobility-vnf
+  mgmt-cp: vnf-cp0-ext
+  product-name: non_static_5g_mobility-vnf
+  sw-image-desc:
+  - id: ubuntu16.04
+    image: ubuntu16.04
+    name: ubuntu16.04
+  vdu:
+  - cloud-init-file: cloud-config.txt
+    id: non_static_5g_mobility-VM
+    int-cpd:
+    - id: vdu-eth0-int
+      virtual-network-interface-requirement:
+      - name: vdu-eth0
+        virtual-interface:
+          type: PARAVIRT
+    name: non_static_5g_mobility-VM
+    sw-image-desc: ubuntu16.04
+    virtual-compute-desc: non_static_5g_mobility-VM-compute
+    virtual-storage-desc:
+    - non_static_5g_mobility-VM-storage
+  version: '1.0'
+  virtual-compute-desc:
+  - id: non_static_5g_mobility-VM-compute
+    virtual-cpu:
+      num-virtual-cpu: "4"
+    virtual-memory:
+      size: "4.0"
+  virtual-storage-desc:
+  - id: non_static_5g_mobility-VM-storage
+    size-of-storage: "60"

build_cv_image_vnf/charms/sshproxy/.flake8

@@ -0,0 +1,9 @@
+[flake8]
+max-line-length = 99
+select: E,W,F,C,N
+exclude:
+  venv
+  .git
+  build
+  dist
+  *.egg_info

build_cv_image_vnf/charms/sshproxy/.gitignore

@@ -0,0 +1,10 @@
+# Copyright 2020 David Garcia
+# See LICENSE file for licensing details.
+
+__pycache__
+*.pyc
+.vscode
+venv
+sshproxy.charm
+build
+__pycache__

build_cv_image_vnf/charms/sshproxy/.jujuignore

@@ -0,0 +1,3 @@
+/venv
+*.py[cod]
+*.charm