diff --git a/nise/generators/gcp/__init__.py b/nise/generators/gcp/__init__.py index 6b0fedf4d..b2687e27e 100644 --- a/nise/generators/gcp/__init__.py +++ b/nise/generators/gcp/__init__.py @@ -11,7 +11,5 @@ from nise.generators.gcp.gcp_generator import GCPGenerator # noqa: F401 from nise.generators.gcp.gcp_network_generator import GCPNetworkGenerator # noqa: F401 from nise.generators.gcp.gcp_network_generator import JSONLGCPNetworkGenerator # noqa: F401 -from nise.generators.gcp.hcs_generator import HCSGenerator # noqa: F401 -from nise.generators.gcp.hcs_generator import JSONLHCSGenerator # noqa: F401 from nise.generators.gcp.project_generator import JSONLProjectGenerator # noqa: F401 from nise.generators.gcp.project_generator import ProjectGenerator # noqa: F401 diff --git a/nise/generators/gcp/hcs_generator.py b/nise/generators/gcp/hcs_generator.py deleted file mode 100644 index 68164aa58..000000000 --- a/nise/generators/gcp/hcs_generator.py +++ /dev/null @@ -1,32 +0,0 @@ -from nise.generators.gcp.compute_engine_generator import ComputeEngineGenerator -from nise.generators.gcp.compute_engine_generator import JSONLComputeEngineGenerator - - -class HCSGenerator(ComputeEngineGenerator): - LABELS = (([{"key": "goog-dm", "value": "red-hat-openshift-container-platform-1"}]),) - SERVICE = ("Red Hat® OpenShift® Container Platform", "7890-9662-83CC") - SKU = (("DD70-0A3E-6C9F", "Licensing Fee for vCPU-per-hour on VM with 0 VCPU or more", "seconds", "hour"),) - SYSTEM_LABELS = ( - ( - [ - {"key": "compute.googleapis.com/cores", "value": "4"}, - {"key": "compute.googleapis.com/machine_spec", "value": "n2d-standard-4"}, - {"key": "compute.googleapis.com/memory", "value": "16384"}, - ] - ), - ) - - -class JSONLHCSGenerator(JSONLComputeEngineGenerator): - LABELS = (([{"key": "goog-dm", "value": "red-hat-openshift-container-platform-1"}]),) - SERVICE = ("Red Hat® OpenShift® Container Platform", "7890-9662-83CC") - SKU = (("DD70-0A3E-6C9F", "Licensing Fee for vCPU-per-hour on VM with 0 VCPU or more", "seconds", "hour"),) - SYSTEM_LABELS = ( - ( - [ - {"key": "compute.googleapis.com/cores", "value": "4"}, - {"key": "compute.googleapis.com/machine_spec", "value": "n2d-standard-4"}, - {"key": "compute.googleapis.com/memory", "value": "16384"}, - ] - ), - ) diff --git a/nise/report.py b/nise/report.py index aa4e59ee7..eebc4f052 100644 --- a/nise/report.py +++ b/nise/report.py @@ -66,12 +66,10 @@ from nise.generators.gcp import GCP_RESOURCE_COLUMNS from nise.generators.gcp import GCPDatabaseGenerator from nise.generators.gcp import GCPNetworkGenerator -from nise.generators.gcp import HCSGenerator from nise.generators.gcp import JSONLCloudStorageGenerator from nise.generators.gcp import JSONLComputeEngineGenerator from nise.generators.gcp import JSONLGCPDatabaseGenerator from nise.generators.gcp import JSONLGCPNetworkGenerator -from nise.generators.gcp import JSONLHCSGenerator from nise.generators.gcp import JSONLProjectGenerator from nise.generators.gcp import ProjectGenerator from nise.generators.oci import OCIBlockStorageGenerator @@ -1108,7 +1106,6 @@ def gcp_create_report(options): # noqa: C901 {"generator": JSONLComputeEngineGenerator, "attributes": {}}, {"generator": JSONLGCPNetworkGenerator, "attributes": {}}, {"generator": JSONLGCPDatabaseGenerator, "attributes": {}}, - {"generator": JSONLHCSGenerator, "attributes": {}}, ] account = fake.word() project_generator = JSONLProjectGenerator(account)