Skip to content

Commit

Permalink
add outscale provider
Browse files Browse the repository at this point in the history
Outscale isa French IIAS provider

This commit add support for generated diagram with outscale images

Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
  • Loading branch information
matthias.gatto authored and outscale-mgo committed Aug 17, 2020
1 parent 8f50d36 commit 67ac88a
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 7 deletions.
12 changes: 6 additions & 6 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
app_root_dir="diagrams"

# NOTE: azure icon set is not latest version
providers=("onprem" "aws" "azure" "gcp" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack")
providers=("onprem" "aws" "azure" "gcp" "firebase" "k8s" "alibabacloud" "oci" "programming" "saas" "elastic" "generic" "openstack" "outscale")

if ! [ -x "$(command -v round)" ]; then
echo 'round is not installed'
Expand All @@ -31,25 +31,25 @@ for pvd in "${providers[@]}"; do
# convert the svg to png for azure provider
if [ "$pvd" = "onprem" ] || [ "$pvd" = "azure" ]; then
echo "converting the svg to png using inkscape for provider '$pvd'"
python -m scripts.resource svg2png "$pvd"
python3 -m scripts.resource svg2png "$pvd"
fi
if [ "$pvd" == "oci" ]; then
echo "converting the svg to png using image magick for provider '$pvd'"
python -m scripts.resource svg2png2 "$pvd"
python3 -m scripts.resource svg2png2 "$pvd"
fi
echo "cleaning the resource names for provider '$pvd'"
python -m scripts.resource clean "$pvd"
python3 -m scripts.resource clean "$pvd"
# round the all png images for aws provider
if [ "$pvd" = "aws" ]; then
echo "rounding the resources for provider '$pvd'"
python -m scripts.resource round "$pvd"
python3 -m scripts.resource round "$pvd"
fi
done

# generate the module classes and docs
for pvd in "${providers[@]}"; do
echo "generating the modules & docs for provider '$pvd'"
python -m scripts.generate "$pvd"
python3 -m scripts.generate "$pvd"
done

# run black
Expand Down
8 changes: 7 additions & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

PROVIDERS = (
"base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic",
"generic", "openstack")
"generic", "openstack", "outscale")

#########################
# Resource Processing #
Expand All @@ -38,6 +38,7 @@
"programming": (),
"saas": (),
"elastic": (),
"outscale": (),
"generic": (),
"openstack": (),
}
Expand Down Expand Up @@ -66,6 +67,8 @@
"oci": ("oci", "ocid", "oke", "ocir", "ddos", "waf", "bm", "vm", "cdn", "vpn", "dns", "nat", "dms", "api", "id"),
"elastic": ("apm", "siem", "ece", "eck"),
"generic": ("vpn", "ios", "xen", "sql"),
"outscale": ("osc",),
"generic": ("vpn", "ios", "xen"),
"openstack": ("rpm", "loci", "nfv", "ec2api"),
}

Expand Down Expand Up @@ -395,6 +398,9 @@
"Logstash": "LogStash",
}
},
"outscale": {
"Osc": "OSC",
},
"generic": {},
"openstack": {
"user": {
Expand Down
30 changes: 30 additions & 0 deletions docs/nodes/outscale.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
id: outscale
title: Outscale
---

Node classes list of outscale provider.

## outscale.compute

- **diagrams.outscale.compute.Compute**
- **diagrams.outscale.compute.DirectConnect**

## outscale.network

- **diagrams.outscale.network.ClientVpn**
- **diagrams.outscale.network.InternetService**
- **diagrams.outscale.network.LoadBalancer**
- **diagrams.outscale.network.NatService**
- **diagrams.outscale.network.Net**
- **diagrams.outscale.network.SiteToSiteVpng**

## outscale.security

- **diagrams.outscale.security.Firewall**
- **diagrams.outscale.security.IdentityAndAccessManagement**

## outscale.storage

- **diagrams.outscale.storage.SimpleStorageService**
- **diagrams.outscale.storage.Storage**
Binary file added resources/outscale/compute/compute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/compute/direct-connect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/client-vpn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/internet-service.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/load-balancer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/nat-service.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/net.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/network/site-to-site-vpng.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/security/firewall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/outscale/storage/storage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions scripts/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ def cleaner_saas(f):
def cleaner_elastic(f):
return f.lower()

def cleaner_outscale(f):
return f.lower()


def cleaner_openstack(f):
return f.lower()
Expand All @@ -125,6 +128,7 @@ def cleaner_openstack(f):
"programming": cleaner_programming,
"saas": cleaner_saas,
"elastic": cleaner_elastic,
"outscale": cleaner_outscale,
"generic": cleaner_generic,
"openstack": cleaner_openstack,
}
Expand Down

0 comments on commit 67ac88a

Please sign in to comment.