Updated OCI icon set (2020)

config.py

@@ -62,7 +62,7 @@
         "api", "cm", "ccm", "crb", "crd", "ds", "etcd", "hpa", "k8s", "ns", "psp", "pv", "pvc", "rb", "rs",
         "sa", "sc", "sts", "svc",
     ),
-    "oci": ("oci",),
+    "oci": ("oci", "oke", "ocir"),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
 }
@@ -357,13 +357,19 @@
     "oci": {
         "compute": {
             "Vm": "VirtualMachine",
-            "VmGrey": "VirtualMachineGrey",
+            "VmWhite": "VirtualMachineWhite",
             "Bm": "BareMetal",
-            "BmGrey": "BareMetalGrey",
+            "BmWhite": "BareMetalWhite",
+            "OCIR": "OCIRegistry",
+            "OCIRWhite": "OCIRegistryWhite",
+            "OKE": "ContainerEngine",
+            "OKEWhite": "ContainerEngineWhite",
         },
         "database": {
+            "AutonomousDatabase": "ADB",
+            "AutonomousDatabaseWhite": "ADBWhite",
             "Databaseservice": "DBService",
-            "DatabaseserviceGrey": "DBServiceGrey",
+            "DatabaseserviceWhite": "DBServiceWhite",
         }
     },
     "programming": {

diagrams/oci/__init__.py

@@ -1,5 +1,5 @@
 """
-OCI provides a set of services for Oracle Cloud provider.
+OCI provides a set of services for Oracle Cloud Infrastructure provider.
 """
 
 from diagrams import Node
@@ -9,4 +9,4 @@ class _OCI(Node):
     _provider = "oci"
     _icon_dir = "resources/oci"
 
-    fontcolor = "#2d3436"
+    fontcolor = "#312D2A"

diagrams/oci/compute.py

@@ -8,24 +8,64 @@ class _Compute(_OCI):
     _icon_dir = "resources/oci/compute"
 
 
-class BmGrey(_Compute):
-    _icon = "bm-grey.png"
+class AutoScaleWhite(_Compute):
+    _icon = "autoscale-white.png"
+
+
+class AutoScale(_Compute):
+    _icon = "autoscale.png"
+
+
+class BmWhite(_Compute):
+    _icon = "bm-white.png"
 
 
 class Bm(_Compute):
     _icon = "bm.png"
 
 
-class ContainerGrey(_Compute):
-    _icon = "container-grey.png"
+class ContainerWhite(_Compute):
+    _icon = "container-white.png"
 
 
 class Container(_Compute):
     _icon = "container.png"
 
 
-class VmGrey(_Compute):
-    _icon = "vm-grey.png"
+class FunctionsWhite(_Compute):
+    _icon = "functions-white.png"
+
+
+class Functions(_Compute):
+    _icon = "functions.png"
+
+
+class InstancePoolsWhite(_Compute):
+    _icon = "instancepools.png"
+
+
+class InstancePools(_Compute):
+    _icon = "instancepools.png"
+
+
+class OCIRWhite(_Compute):
+    _icon = "ociregistry-white.png"
+
+
+class OCIR(_Compute):
+    _icon = "ociregistry.png"
+
+
+class OKEWhite(_Compute):
+    _icon = "containerengine-white.png"
+
+
+class OKE(_Compute):
+    _icon = "containerengine.png"
+
+
+class VmWhite(_Compute):
+    _icon = "vm-white.png"
 
 
 class Vm(_Compute):
@@ -35,6 +75,6 @@ class Vm(_Compute):
 # Aliases
 
 VirtualMachine = Vm
-VirtualMachineGrey = VmGrey
+VirtualMachineWhite = VmWhite
 BareMetal = Bm
-BareMetalGrey = BmGrey
+BareMetalWhite = BmWhite

diagrams/oci/connectivity.py

@@ -8,40 +8,40 @@ class _Connectivity(_OCI):
     _icon_dir = "resources/oci/connectivity"
 
 
-class BackboneGrey(_Connectivity):
-    _icon = "backbone-grey.png"
+class BackboneWhite(_Connectivity):
+    _icon = "backbone-white.png"
 
 
 class Backbone(_Connectivity):
     _icon = "backbone.png"
 
 
-class CustomerdatacenterGrey(_Connectivity):
-    _icon = "customerdatacenter-grey.png"
+class CustomerdatacenterWhite(_Connectivity):
+    _icon = "customerdatacenter-white.png"
 
 
 class Customerdatacenter(_Connectivity):
     _icon = "customerdatacenter.png"
 
 
-class CustomerpremisesequipGrey(_Connectivity):
-    _icon = "customerpremisesequip-grey.png"
+class CustomerpremisesequipWhite(_Connectivity):
+    _icon = "customerpremisesequip-white.png"
 
 
 class Customerpremisesequip(_Connectivity):
     _icon = "customerpremisesequip.png"
 
 
-class FastconnectGrey(_Connectivity):
-    _icon = "fastconnect-grey.png"
+class FastconnectWhite(_Connectivity):
+    _icon = "fastconnect-white.png"
 
 
 class Fastconnect(_Connectivity):
     _icon = "fastconnect.png"
 
 
-class VpnGrey(_Connectivity):
-    _icon = "vpn-grey.png"
+class VpnWhite(_Connectivity):
+    _icon = "vpn-white.png"
 
 
 class Vpn(_Connectivity):

diagrams/oci/database.py

@@ -8,8 +8,16 @@ class _Database(_OCI):
     _icon_dir = "resources/oci/database"
 
 
-class DatabaseserviceGrey(_Database):
-    _icon = "databaseservice-grey.png"
+class AutonomousDatabaseWhite(_Database):
+    _icon = "autonomous-white.png"
+
+
+class AutonomousDatabase(_Database):
+    _icon = "autonomous.png"
+
+
+class DatabaseserviceWhite(_Database):
+    _icon = "databaseservice-white.png"
 
 
 class Databaseservice(_Database):
@@ -18,5 +26,7 @@ class Databaseservice(_Database):
 
 # Aliases
 
+ADB = AutonomousDatabase
+ADBWhite = AutonomousDatabaseWhite
 DBService = Databaseservice
-DBServiceGrey = DatabaseserviceGrey
+DBServiceWhite = DatabaseserviceWhite

diagrams/oci/devops.py

@@ -8,16 +8,24 @@ class _Devops(_OCI):
     _icon_dir = "resources/oci/devops"
 
 
-class ApiserviceGrey(_Devops):
-    _icon = "apiservice-grey.png"
+class ApigatewayWhite(_Devops):
+    _icon = "apigateway-white.png"
+
+
+class Apigateway(_Devops):
+    _icon = "apigateway.png"
+
+
+class ApiserviceWhite(_Devops):
+    _icon = "apiservice-white.png"
 
 
 class Apiservice(_Devops):
     _icon = "apiservice.png"
 
 
-class ResourcemgmtGrey(_Devops):
-    _icon = "resourcemgmt-grey.png"
+class ResourcemgmtWhite(_Devops):
+    _icon = "resourcemgmt-white.png"
 
 
 class Resourcemgmt(_Devops):

diagrams/oci/edge.py

@@ -8,32 +8,32 @@ class _Edge(_OCI):
     _icon_dir = "resources/oci/edge"
 
 
-class CdnGrey(_Edge):
-    _icon = "cdn-grey.png"
+class CdnWhite(_Edge):
+    _icon = "cdn-white.png"
 
 
 class Cdn(_Edge):
     _icon = "cdn.png"
 
 
-class DnsGrey(_Edge):
-    _icon = "dns-grey.png"
+class DnsWhite(_Edge):
+    _icon = "dns-white.png"
 
 
 class Dns(_Edge):
     _icon = "dns.png"
 
 
-class EmaildeliveryGrey(_Edge):
-    _icon = "emaildelivery-grey.png"
+class EmaildeliveryWhite(_Edge):
+    _icon = "emaildelivery-white.png"
 
 
 class Emaildelivery(_Edge):
     _icon = "emaildelivery.png"
 
 
-class WafGrey(_Edge):
-    _icon = "waf-grey.png"
+class WafWhite(_Edge):
+    _icon = "waf-white.png"
 
 
 class Waf(_Edge):

diagrams/oci/monitoring.py

@@ -8,80 +8,80 @@ class _Monitoring(_OCI):
     _icon_dir = "resources/oci/monitoring"
 
 
-class AlarmGrey(_Monitoring):
-    _icon = "alarm-grey.png"
+class AlarmWhite(_Monitoring):
+    _icon = "alarm-white.png"
 
 
 class Alarm(_Monitoring):
     _icon = "alarm.png"
 
 
-class EventGrey(_Monitoring):
-    _icon = "event-grey.png"
+class EventWhite(_Monitoring):
+    _icon = "event-white.png"
 
 
 class Event(_Monitoring):
     _icon = "event.png"
 
 
-class HealthcheckGrey(_Monitoring):
-    _icon = "healthcheck-grey.png"
+class HealthcheckWhite(_Monitoring):
+    _icon = "healthcheck-white.png"
 
 
 class Healthcheck(_Monitoring):
     _icon = "healthcheck.png"
 
 
-class LoggingGrey(_Monitoring):
-    _icon = "logging-grey.png"
+class LoggingWhite(_Monitoring):
+    _icon = "logging-white.png"
 
 
 class Logging(_Monitoring):
     _icon = "logging.png"
 
 
-class NotificationsGrey(_Monitoring):
-    _icon = "notifications-grey.png"
+class NotificationsWhite(_Monitoring):
+    _icon = "notifications-white.png"
 
 
 class Notifications(_Monitoring):
     _icon = "notifications.png"
 
 
-class QueuingGrey(_Monitoring):
-    _icon = "queuing-grey.png"
+class QueuingWhite(_Monitoring):
+    _icon = "queuing-white.png"
 
 
 class Queuing(_Monitoring):
     _icon = "queuing.png"
 
 
-class SearchGrey(_Monitoring):
-    _icon = "search-grey.png"
+class SearchWhite(_Monitoring):
+    _icon = "search-white.png"
 
 
 class Search(_Monitoring):
     _icon = "search.png"
 
 
-class StreamingGrey(_Monitoring):
-    _icon = "streaming-grey.png"
+class StreamingWhite(_Monitoring):
+    _icon = "streaming-white.png"
 
 
 class Streaming(_Monitoring):
     _icon = "streaming.png"
 
 
-class TelemetryGrey(_Monitoring):
-    _icon = "telemetry-grey.png"
+class TelemetryWhite(_Monitoring):
+    _icon = "telemetry-white.png"
 
 
 class Telemetry(_Monitoring):
     _icon = "telemetry.png"
 
 
-class WorkflowGrey(_Monitoring):
-    _icon = "workflow-grey.png"
+class WorkflowWhite(_Monitoring):
+    _icon = "workflow-white.png"
 
 
 class Workflow(_Monitoring):