From b4a95cec815517b412317e2ee40b9ca021d9e0d5 Mon Sep 17 00:00:00 2001
From: S M <>
Date: Sun, 16 Feb 2020 10:52:53 -0500
Subject: [PATCH] Code cleanup per pull request feedback

---
 README.md                                           |   2 +-
 config.py                                           |   2 +-
 diagrams/oci/network.py                             |   4 ++--
 diagrams/oci/security.py                            |   4 ++--
 docs/guides/node.md                                 |   2 +-
 docs/nodes/oci.md                                   |   4 ++--
 .../{service_gateway.png => service-gateway.png}    | Bin
 .../oci/security/{id_access.png => id-access.png}   | Bin
 scripts/resource.py                                 |   4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename resources/oci/network/{service_gateway.png => service-gateway.png} (100%)
 rename resources/oci/security/{id_access.png => id-access.png} (100%)

diff --git a/README.md b/README.md
index 451a70a0..7cb4da56 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 **Diagram as Code**.
 
-Diagrams lets you draw the cloud system architecture **in Python code**. It was born for **prototyping** a new system architecture design without any design tools. You can also describe or visualize the existing system architecture as well. Diagrams currently supports five major providers: `AWS`, `Azure`, `GCP`, `Kubernetes`, `Alibaba Cloud` and `Oracle Cloud`.
+Diagrams lets you draw the cloud system architecture **in Python code**. It was born for **prototyping** a new system architecture design without any design tools. You can also describe or visualize the existing system architecture as well. Diagrams currently supports six major providers: `AWS`, `Azure`, `GCP`, `Kubernetes`, `Alibaba Cloud` and `Oracle Cloud`.
 
 **Diagram as Code** also allows you to **tracking** the architecture diagram changes on any **version control** system.
 
diff --git a/config.py b/config.py
index cace6f02..6c7296fe 100644
--- a/config.py
+++ b/config.py
@@ -31,7 +31,7 @@ FILE_PREFIXES = {
     "gcp": ("cloud-",),
     "k8s": (),
     "alibabacloud": (),
-    "oci": ("OCI_",),
+    "oci": ("OCI-",),
 }
 
 #########################
diff --git a/diagrams/oci/network.py b/diagrams/oci/network.py
index 6cb62c5c..bf81c804 100644
--- a/diagrams/oci/network.py
+++ b/diagrams/oci/network.py
@@ -32,8 +32,8 @@ class Securitylists(_Network):
     _icon = "securitylists.png"
 
 
-class Service_Gateway(_Network):
-    _icon = "service_gateway.png"
+class ServiceGateway(_Network):
+    _icon = "service-gateway.png"
 
 
 class Vcloudnetwork(_Network):
diff --git a/diagrams/oci/security.py b/diagrams/oci/security.py
index 7448ee6e..2e3a655b 100644
--- a/diagrams/oci/security.py
+++ b/diagrams/oci/security.py
@@ -28,8 +28,8 @@ class Groups(_Security):
     _icon = "groups.png"
 
 
-class Id_Access(_Security):
-    _icon = "id_access.png"
+class IdAccess(_Security):
+    _icon = "id-access.png"
 
 
 class Keymgmt(_Security):
diff --git a/docs/guides/node.md b/docs/guides/node.md
index e3f28bc7..3bd1182e 100644
--- a/docs/guides/node.md
+++ b/docs/guides/node.md
@@ -51,7 +51,7 @@ from diagrams.k8s.network import Service
 from diagrams.k8s.storage import PV, PVC, StorageClass
 ...
 
-# Oracle resources
+# oracle resources
 from diagrams.oci.compute import VirtualMachine, Container
 from diagrams.oci.network import Firewall
 from diagrams.oci.storage import Filestorage, Storagegateway
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index b79c7aaf..c44dbef0 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -56,7 +56,7 @@ Node classes list of oci provider.
 - **diagrams.oci.network.Loadbalance**
 - **diagrams.oci.network.Routetable**
 - **diagrams.oci.network.Securitylists**
-- **diagrams.oci.network.Service_Gateway**
+- **diagrams.oci.network.ServiceGateway**
 - **diagrams.oci.network.Vcloudnetwork**
 
 ## oci.security
@@ -66,7 +66,7 @@ Node classes list of oci provider.
 - **diagrams.oci.security.Ddos**
 - **diagrams.oci.security.Encryption**
 - **diagrams.oci.security.Groups**
-- **diagrams.oci.security.Id_Access**
+- **diagrams.oci.security.IdAccess**
 - **diagrams.oci.security.Keymgmt**
 - **diagrams.oci.security.Ocid**
 - **diagrams.oci.security.Policies**
diff --git a/resources/oci/network/service_gateway.png b/resources/oci/network/service-gateway.png
similarity index 100%
rename from resources/oci/network/service_gateway.png
rename to resources/oci/network/service-gateway.png
diff --git a/resources/oci/security/id_access.png b/resources/oci/security/id-access.png
similarity index 100%
rename from resources/oci/security/id_access.png
rename to resources/oci/security/id-access.png
diff --git a/scripts/resource.py b/scripts/resource.py
index c8640605..684028d7 100644
--- a/scripts/resource.py
+++ b/scripts/resource.py
@@ -66,8 +66,8 @@ def cleaner_alibabacloud(f):
 
 
 def cleaner_oci(f):
-    f = f.replace("-", "_")
-    f = f.replace("_grey", "")
+    f = f.replace("_", "-")
+    f = f.replace("-grey", "")
     for p in cfg.FILE_PREFIXES["oci"]:
         if f.startswith(p):
             f = f[len(p) :]