From 75f312861a5449b4528512152d63569b45735b8b Mon Sep 17 00:00:00 2001 From: Corey Goodfred Date: Mon, 3 Jun 2024 08:25:53 -0400 Subject: [PATCH] [COST-4745] Update compute engine SKUs for networking (#508) * [COST-4745] Update compute engine SKUs for Networking --- nise/__init__.py | 2 +- .../gcp/compute_engine_generator.py | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/nise/__init__.py b/nise/__init__.py index 9557e01a..3d0a53dd 100644 --- a/nise/__init__.py +++ b/nise/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.5.2" +__version__ = "4.5.3" VERSION = __version__.split(".") diff --git a/nise/generators/gcp/compute_engine_generator.py b/nise/generators/gcp/compute_engine_generator.py index 45185909..28202377 100644 --- a/nise/generators/gcp/compute_engine_generator.py +++ b/nise/generators/gcp/compute_engine_generator.py @@ -35,16 +35,25 @@ class ComputeEngineGenerator(GCPGenerator): ("CD20-B4CA-0F7C", "Licensing Fee for Debian 10 Buster (RAM cost)", "byte-seconds", "gibibyte hour"), ("236F-83FC-852C", "Licensing Fee for Red Hat Enterprise Linux 8 (RAM cost)", "byte-seconds", "gibibyte hour"), ("8C61-80B1-C43A", "Licensing Fee for Red Hat Enterprise Linux 8 on VM with 1 to 4 VCPU", "seconds", "hour"), - ("6B8F-E63D-832B", "Network Internet Egress from Americas to APAC", "bytes", "gibibyte"), - ("DFA5-B5C6-36D6", "Network Internet Egress from Americas to EMEA", "bytes", "gibibyte"), - ("9DE9-9092-B3BC", "Network Internet Egress from Americas to China", "bytes", "gibibyte"), - ("7151-106A-2684", "Network Internet Ingress from APAC to Americas", "bytes", "gibibyte"), - ("2F99-3A90-373B", "Network Internet Ingress from EMEA to Americas", "bytes", "gibibyte"), - ("92CB-C25F-B1D1", "Network Google Egress from Americas to Americas", "bytes", "gibibyte"), - ("227B-5B2B-A75A", "Network Internet Ingress from China to Americas", "bytes", "gibibyte"), - ("123C-0EFC-B7C8", "Network Google Ingress from Americas to Americas", "bytes", "gibibyte"), - ("F274-1692-F213", "Network Internet Engress from Americas to Americas", "bytes", "gibibyte"), - ("92CB-C25F-B1D1", "Network Google Egress from Americas to Americas", "bytes", "gibibyte"), # Left off at 125 + ("BBF8-C07D-1DF4", "Network Inter Region Data Transfer In from APAC to Americas", "bytes", "gibibyte"), + ("0C3C-6B13-B1E8", "Network Inter Region Data Transfer Out from Americas to Los Angeles", "bytes", "gibibyte"), + ("FDBC-6E3B-D4D8", "Network Internet Data Transfer Out from Americas to Australia", "bytes", "gibibyte"), + ("B307-417F-4FD2", "Network Internet Data Transfer In from EMEA to Virginia", "bytes", "gibibyte"), + ("5A40-9F05-4385", "Network Inter Region Data Transfer In from Hong Kong to Virginia", "bytes", "gibibyte"), + ("6B8F-E63D-832B", "Network Internet Data Transfer Out from Americas to APAC", "bytes", "gibibyte"), + ("DFA5-B5C6-36D6", "Network Internet Data Transfer Out from Americas to EMEA", "bytes", "gibibyte"), + ("9DE9-9092-B3BC", "Network Internet Data Transfer Out from Americas to China", "bytes", "gibibyte"), + ("7151-106A-2684", "Network Internet Data Transfer In from APAC to Americas", "bytes", "gibibyte"), + ("2F99-3A90-373B", "Network Internet Data Transfer In from EMEA to Americas", "bytes", "gibibyte"), + ("92CB-C25F-B1D1", "Network Data Transfer to Google Services from Americas to Americas", "bytes", "gibibyte"), + ("227B-5B2B-A75A", "Network Internet Data Transfer In from China to Americas", "bytes", "gibibyte"), + ( + "123C-0EFC-B7C8", + "Network Data Transfer In from Google Services from Americas to Americas", + "bytes", + "gibibyte", + ), + ("F274-1692-F213", "Network Internet Data Transfer Out from Americas to Americas", "bytes", "gibibyte"), ) LABELS = (([{"key": "vm_key_proj2", "value": "vm_label_proj2"}]), ([]))