diff --git a/05-osm-usage.md b/05-osm-usage.md index 87400065b22d4096a46ce03ca33ff2c3d1e4973c..141e767638ac7cfa6cd2f3f1cc8566942292ae2a 100644 --- a/05-osm-usage.md +++ b/05-osm-usage.md @@ -306,13 +306,20 @@ In OSM, Day-0 is usually covered by cloud-init, as it just implies basic configu Day-1 and Day-2 are both managed by the VCA (VNF Configuration & Abstraction) module, which consists of a Juju Controller that interacts with VNFs through "charms", a generic set of scripts for deploying and operating software which can be adapted to any use case. -There are two types of charms: +There are three types of charms: - **Native charms:** the set of scripts run inside the VNF components. This kind of charms are new in Release 7. -- **Proxy charms:** the set of scripts run in LXC containers in an OSM-managed machine (which could be where OSM resides), which use ssh or other methods to get into the VNF instances and configure them. + +![OSM Proxy Charms](assets/800px-OSM_nativecharms.png) + +- **Proxy charms:** the set of scripts run in LXC containers in an OSM-managed machine (which could be where OSM resides), which use ssh **or other methods** such as HTTP to get into the VNF instances and configure them. ![OSM Proxy Charms](assets/800px-OSM_proxycharms.png) +- **Network Service charms:** This kind of charm is specified at the network service level, and it can invoke actions in the running charms at the VNF level (both native and proxy charms). + +![OSM Proxy Charms](assets/800px-OSM_nscharms.png) + These charms can run with three scopes: - VDU: running a per-vdu charm, with individual actions for each. diff --git a/assets/800px-OSM_nativecharms.png b/assets/800px-OSM_nativecharms.png new file mode 100644 index 0000000000000000000000000000000000000000..c3d0c83802bb3fa8a43b3f16742cee7c1de87ac3 Binary files /dev/null and b/assets/800px-OSM_nativecharms.png differ diff --git a/assets/800px-OSM_nscharms.png b/assets/800px-OSM_nscharms.png new file mode 100644 index 0000000000000000000000000000000000000000..62034e7580dfa17db8a85dab087dd7f5ad04538a Binary files /dev/null and b/assets/800px-OSM_nscharms.png differ diff --git a/assets/800px-OSM_proxycharms.png b/assets/800px-OSM_proxycharms.png index 84409b07d0bbacfc0737c09dfdb44ddb5c22c8eb..f40fee603e6f32d520e1b37a1bee7a277af1fde2 100644 Binary files a/assets/800px-OSM_proxycharms.png and b/assets/800px-OSM_proxycharms.png differ