feat(aws): Add new flavors

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ie63b3d6c7ff376d808587e7c96f386946c939a81

5 files changed, 0 insertions, 533 deletions

diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/main.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/main.tf
deleted file mode 100644
index 1f190426ad..0000000000
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/main.tf
+++ /dev/null
@@ -1,322 +0,0 @@
-data "vault_aws_access_credentials" "creds" {
-  backend = "${var.vault-name}-path"
-  role    = "${var.vault-name}-role"
-}
-
-locals {
-  ansible_python_executable = "/usr/bin/python3"
-  availability_zone         = "eu-central-1a"
-  name                      = "csit-vpc"
-  environment               = "csit-vpc-environment"
-  key_pair_key_name         = "${var.resource_prefix}-${var.testbed_name}-pk"
-  placement_group_name      = "${var.resource_prefix}-${var.testbed_name}-pg"
-  security_group_name       = "${var.resource_prefix}-${var.testbed_name}-sg"
-  testbed_name              = "testbed1"
-  topology_name             = "2n-aws-c6gn"
-  tg_name                   = "${var.resource_prefix}-${var.testbed_name}-tg"
-  sut1_name                 = "${var.resource_prefix}-${var.testbed_name}-sut1"
-}
-
-# Create VPC
-module "vpc" {
-  source                   = "../terraform-aws-vpc"
-  security_group_name      = local.security_group_name
-  subnet_availability_zone = local.availability_zone
-  tags_name                = local.name
-  tags_environment         = local.environment
-  vpc_enable_dns_hostnames = false
-}
-
-# Create Subnet
-module "subnet_b" {
-  source                   = "../terraform-aws-subnet"
-  subnet_cidr_block        = "192.168.10.0/24"
-  subnet_ipv6_cidr_block   = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 2)
-  subnet_availability_zone = local.availability_zone
-  tags_name                = local.name
-  tags_environment         = local.environment
-  subnet_vpc_id            = module.vpc.vpc_id
-}
-
-module "subnet_d" {
-  source                   = "../terraform-aws-subnet"
-  subnet_cidr_block        = "192.168.20.0/24"
-  subnet_ipv6_cidr_block   = cidrsubnet(module.vpc.vpc_ipv6_cidr_block, 8, 4)
-  subnet_availability_zone = local.availability_zone
-  tags_name                = local.name
-  tags_environment         = local.environment
-  subnet_vpc_id            = module.vpc.vpc_id
-}
-
-# Create Private Key
-resource "tls_private_key" "private_key" {
-  algorithm   = var.private_key_algorithm
-  ecdsa_curve = var.private_key_ecdsa_curve
-  rsa_bits    = var.private_key_rsa_bits
-}
-
-# Create Key Pair
-resource "aws_key_pair" "key_pair" {
-  depends_on = [
-    tls_private_key.private_key
-  ]
-  key_name   = local.key_pair_key_name
-  public_key = tls_private_key.private_key.public_key_openssh
-}
-
-# Create Placement Group
-resource "aws_placement_group" "placement_group" {
-  name     = local.placement_group_name
-  strategy = var.placement_group_strategy
-}
-
-# Create Instance
-resource "aws_instance" "tg" {
-  depends_on = [
-    module.vpc,
-    aws_placement_group.placement_group
-  ]
-  ami                                  = var.tg_ami
-  availability_zone                    = local.availability_zone
-  associate_public_ip_address          = var.tg_associate_public_ip_address
-  instance_initiated_shutdown_behavior = var.tg_instance_initiated_shutdown_behavior
-  instance_type                        = var.tg_instance_type
-  key_name                             = aws_key_pair.key_pair.key_name
-  placement_group                      = aws_placement_group.placement_group.id
-  private_ip                           = var.tg_private_ip
-  source_dest_check                    = var.tg_source_dest_check
-  subnet_id                            = module.vpc.vpc_subnet_id
-  vpc_security_group_ids               = [module.vpc.vpc_security_group_id]
-  # host_id                            = "1"
-
-  root_block_device {
-    delete_on_termination = true
-    volume_size           = 50
-  }
-
-  tags = {
-    "Name"        = local.tg_name
-    "Environment" = local.environment
-  }
-}
-
-resource "aws_network_interface" "tg_if1" {
-  depends_on = [
-    module.subnet_b,
-    aws_instance.tg
-  ]
-  private_ip        = var.tg_if1_private_ip
-  private_ips       = [var.tg_if1_private_ip]
-  security_groups   = [module.vpc.vpc_security_group_id]
-  source_dest_check = var.tg_source_dest_check
-  subnet_id         = module.subnet_b.subnet_id
-
-  attachment {
-    instance     = aws_instance.tg.id
-    device_index = 1
-  }
-
-  tags = {
-    "Name"        = local.tg_name
-    "Environment" = local.environment
-  }
-}
-
-resource "aws_network_interface" "tg_if2" {
-  depends_on = [
-    module.subnet_d,
-    aws_instance.tg
-  ]
-  private_ip        = var.tg_if2_private_ip
-  private_ips       = [var.tg_if2_private_ip]
-  security_groups   = [module.vpc.vpc_security_group_id]
-  source_dest_check = var.tg_source_dest_check
-  subnet_id         = module.subnet_d.subnet_id
-
-  attachment {
-    instance     = aws_instance.tg.id
-    device_index = 2
-  }
-
-  tags = {
-    "Name"        = local.tg_name
-    "Environment" = local.environment
-  }
-}
-
-data "aws_network_interface" "tg_if1" {
-  id = aws_network_interface.tg_if1.id
-}
-
-data "aws_network_interface" "tg_if2" {
-  id = aws_network_interface.tg_if2.id
-}
-
-resource "aws_route" "route_tg_if1" {
-  depends_on = [
-    aws_instance.tg
-  ]
-  destination_cidr_block = var.destination_cidr_block_tg_if1
-  network_interface_id   = aws_instance.tg.primary_network_interface_id
-  route_table_id         = module.vpc.vpc_main_route_table_id
-}
-
-resource "aws_route" "route_tg_if2" {
-  depends_on = [
-    aws_instance.tg
-  ]
-  destination_cidr_block = var.destination_cidr_block_tg_if2
-  network_interface_id   = aws_instance.tg.primary_network_interface_id
-  route_table_id         = module.vpc.vpc_main_route_table_id
-}
-
-resource "aws_instance" "sut1" {
-  depends_on = [
-    module.vpc,
-    aws_placement_group.placement_group
-  ]
-  ami                                  = var.sut1_ami
-  availability_zone                    = local.availability_zone
-  associate_public_ip_address          = var.sut1_associate_public_ip_address
-  instance_initiated_shutdown_behavior = var.sut1_instance_initiated_shutdown_behavior
-  instance_type                        = var.sut1_instance_type
-  key_name                             = aws_key_pair.key_pair.key_name
-  placement_group                      = aws_placement_group.placement_group.id
-  private_ip                           = var.sut1_private_ip
-  source_dest_check                    = var.sut1_source_dest_check
-  subnet_id                            = module.vpc.vpc_subnet_id
-  vpc_security_group_ids               = [module.vpc.vpc_security_group_id]
-  # host_id                            = "2"
-
-  root_block_device {
-    delete_on_termination = true
-    volume_size           = 50
-  }
-
-  tags = {
-    "Name"        = local.sut1_name
-    "Environment" = local.environment
-  }
-}
-
-resource "aws_network_interface" "sut1_if1" {
-  depends_on = [
-    module.subnet_b,
-    aws_instance.sut1
-  ]
-  private_ip        = var.sut1_if1_private_ip
-  private_ips       = [var.sut1_if1_private_ip]
-  security_groups   = [module.vpc.vpc_security_group_id]
-  source_dest_check = var.sut1_source_dest_check
-  subnet_id         = module.subnet_b.subnet_id
-
-  attachment {
-    instance     = aws_instance.sut1.id
-    device_index = 1
-  }
-
-  tags = {
-    "Name"        = local.sut1_name
-    "Environment" = local.environment
-  }
-}
-
-resource "aws_network_interface" "sut1_if2" {
-  depends_on = [
-    module.subnet_d,
-    aws_instance.sut1
-  ]
-  private_ip        = var.sut1_if2_private_ip
-  private_ips       = [var.sut1_if2_private_ip]
-  security_groups   = [module.vpc.vpc_security_group_id]
-  source_dest_check = var.sut1_source_dest_check
-  subnet_id         = module.subnet_d.subnet_id
-
-  attachment {
-    instance     = aws_instance.sut1.id
-    device_index = 2
-  }
-
-  tags = {
-    "Name"        = local.sut1_name
-    "Environment" = local.environment
-  }
-}
-
-data "aws_network_interface" "sut1_if1" {
-  id = aws_network_interface.sut1_if1.id
-}
-
-data "aws_network_interface" "sut1_if2" {
-  id = aws_network_interface.sut1_if2.id
-}
-
-resource "null_resource" "deploy_tg" {
-  depends_on = [
-    aws_instance.tg,
-    aws_network_interface.tg_if1,
-    aws_network_interface.tg_if2,
-    aws_instance.sut1,
-    aws_network_interface.sut1_if1,
-    aws_network_interface.sut1_if2
-  ]
-
-  connection {
-    user        = "ubuntu"
-    host        = aws_instance.tg.public_ip
-    private_key = tls_private_key.private_key.private_key_pem
-  }
-
-  provisioner "remote-exec" {
-    inline = var.first_run_commands
-  }
-}
-
-resource "null_resource" "deploy_sut1" {
-  depends_on = [
-    aws_instance.tg,
-    aws_network_interface.tg_if1,
-    aws_network_interface.tg_if2,
-    aws_instance.sut1,
-    aws_network_interface.sut1_if1,
-    aws_network_interface.sut1_if2
-  ]
-
-  connection {
-    user        = "ubuntu"
-    host        = aws_instance.sut1.public_ip
-    private_key = tls_private_key.private_key.private_key_pem
-  }
-
-  provisioner "remote-exec" {
-    inline = var.first_run_commands
-  }
-}
-
-resource "null_resource" "deploy_topology" {
-  depends_on = [
-    aws_instance.tg,
-    aws_instance.sut1
-  ]
-
-  provisioner "ansible" {
-    plays {
-      playbook {
-        file_path = var.ansible_topology_path
-      }
-      hosts = ["local"]
-      extra_vars = {
-        ansible_python_interpreter = local.ansible_python_executable
-        testbed_name               = local.testbed_name
-        cloud_topology             = local.topology_name
-        tg_if1_mac                 = data.aws_network_interface.tg_if1.mac_address
-        tg_if2_mac                 = data.aws_network_interface.tg_if2.mac_address
-        dut1_if1_mac               = data.aws_network_interface.sut1_if1.mac_address
-        dut1_if2_mac               = data.aws_network_interface.sut1_if2.mac_address
-        tg_public_ip               = aws_instance.tg.public_ip
-        dut1_public_ip             = aws_instance.sut1.public_ip
-        public_ip_list             = "${aws_instance.tg.public_ip},${aws_instance.sut1.public_ip}"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/output.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/output.tf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/output.tf
+++ /dev/null
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf
deleted file mode 100644
index d0e7490d38..0000000000
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-provider "aws" {
-  region     = var.region
-  access_key = data.vault_aws_access_credentials.creds.access_key
-  secret_key = data.vault_aws_access_credentials.creds.secret_key
-}
-
-provider "vault" {
-  address         = "http://vault.service.consul:8200"
-  skip_tls_verify = true
-  token           = "s.4z5PsufFwV3sHbCzK9Y2Cojd"
-}
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf
deleted file mode 100644
index 5ac9ad8735..0000000000
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf
+++ /dev/null
@@ -1,180 +0,0 @@
-variable "vault-name" {
-  default = "dynamic-aws-creds-vault-fdio-csit-jenkins"
-}
-
-variable "region" {
-  description = "AWS Region."
-  type        = string
-  default     = "eu-central-1"
-}
-
-variable "resource_prefix" {
-  description = "Resources name prefix."
-  type        = string
-  default     = "csit-2n-aws-c6gn"
-}
-
-variable "testbed_name" {
-  description = "Testbed name."
-  type        = string
-  default     = "testbed1"
-}
-
-# Variables for Private Key
-variable "private_key_algorithm" {
-  description = "The name of the algorithm to use for the key."
-  type        = string
-  default     = "RSA"
-}
-
-variable "private_key_ecdsa_curve" {
-  description = "When algorithm is ECDSA, the name of the elliptic curve to use."
-  type        = string
-  default     = "P521"
-}
-
-variable "private_key_rsa_bits" {
-  description = "When algorithm is RSA, the size of the generated RSA key in bits."
-  type        = number
-  default     = 4096
-}
-
-# Variables for Placement Group
-variable "placement_group_strategy" {
-  description = "The placement strategy. Can be cluster, partition or spread."
-  type        = string
-  default     = "cluster"
-}
-
-# Variables for Instance
-variable "tg_ami" {
-  description = "AMI to use for the instance."
-  type        = string
-  default     = "ami-0c2d02d48236a23dd"
-}
-
-variable "tg_associate_public_ip_address" {
-  description = "Whether to associate a public IP address with an instance in a VPC."
-  type        = bool
-  default     = true
-}
-
-variable "tg_instance_initiated_shutdown_behavior" {
-  description = "Shutdown behavior for the instance."
-  type        = string
-  default     = "terminate"
-}
-
-variable "tg_instance_type" {
-  description = "The instance type to use for the instance."
-  type        = string
-  default     = "c6gn.4xlarge"
-}
-
-variable "tg_private_ip" {
-  description = "Private IP address to associate with the instance in a VPC."
-  type        = string
-  default     = "192.168.0.10"
-}
-
-variable "tg_source_dest_check" {
-  description = "Controls if traffic is routed to the instance when the destination address does not match the instance."
-  type        = bool
-  default     = false
-}
-
-variable "sut1_ami" {
-  description = "AMI to use for the instance."
-  type        = string
-  default     = "ami-05ea90e57d2df4368"
-}
-
-variable "sut1_associate_public_ip_address" {
-  description = "Whether to associate a public IP address with an instance in a VPC."
-  type        = bool
-  default     = true
-}
-
-variable "sut1_instance_initiated_shutdown_behavior" {
-  description = "Shutdown behavior for the instance."
-  type        = string
-  default     = "terminate"
-}
-
-variable "sut1_instance_type" {
-  description = "The instance type to use for the instance."
-  type        = string
-  default     = "c6gn.4xlarge"
-}
-
-variable "sut1_private_ip" {
-  description = "Private IP address to associate with the instance in a VPC."
-  type        = string
-  default     = "192.168.0.11"
-}
-
-variable "sut1_source_dest_check" {
-  description = "Controls if traffic is routed to the instance when the destination address does not match the instance."
-  type        = bool
-  default     = false
-}
-
-# Variables for Network Interface
-variable "tg_if1_private_ip" {
-  description = "List of private IPs to assign to the ENI without regard to order."
-  type        = string
-  default     = "192.168.10.254"
-}
-
-variable "tg_if2_private_ip" {
-  description = "List of private IPs to assign to the ENI without regard to order."
-  type        = string
-  default     = "192.168.20.254"
-}
-
-variable "destination_cidr_block_tg_if1" {
-  description = "The destination CIDR block."
-  type        = string
-  default     = "10.0.0.0/24"
-}
-
-variable "destination_cidr_block_tg_if2" {
-  description = "The destination CIDR block."
-  type        = string
-  default     = "20.0.0.0/24"
-}
-
-variable "sut1_if1_private_ip" {
-  description = "List of private IPs to assign to the ENI without regard to order."
-  type        = string
-  default     = "192.168.10.11"
-}
-
-variable "sut1_if2_private_ip" {
-  description = "List of private IPs to assign to the ENI without regard to order."
-  type        = string
-  default     = "192.168.20.11"
-}
-
-# Variables for Null Resource
-variable "first_run_commands" {
-  description = "List of private IPs to assign to the ENI without regard to order."
-  type        = list(string)
-  default = [
-    "sudo sed -i 's/^PasswordAuthentication/#PasswordAuthentication/' /etc/ssh/sshd_config",
-    "sudo systemctl restart sshd",
-    "sudo useradd --create-home -s /bin/bash provisionuser",
-    "echo 'provisionuser:Csit1234' | sudo chpasswd",
-    "echo 'provisionuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers",
-    "sudo useradd --create-home -s /bin/bash testuser",
-    "echo 'testuser:Csit1234' | sudo chpasswd",
-    "echo 'testuser ALL = (ALL) NOPASSWD: ALL' | sudo tee -a /etc/sudoers"
-  ]
-}
-
-# Variables for Null Resource
-variable "ansible_topology_path" {
-  description = "Ansible topology path."
-  type        = string
-  default     = "../../fdio.infra.ansible/cloud_topology.yaml"
-}
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/versions.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/versions.tf
deleted file mode 100644
index b983240b68..0000000000
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/versions.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source  = "hashicorp/aws"
-      version = ">= 5.1.0"
-    }
-    null = {
-      source  = "hashicorp/null"
-      version = ">= 3.2.1"
-    }
-    tls = {
-      source  = "hashicorp/tls"
-      version = ">= 4.0.4"
-    }
-    vault = {
-      version = ">= 3.15.2"
-    }
-  }
-  required_version = ">= 1.4.2"
-}
\ No newline at end of file