"
+
+ - name: Set orc8r domain name
+ set_fact:
+ orc8r_domain_name: "{{ result.stdout | from_json }}"
+
+ - name: Create certs directory
+ file:
+ name: "{{ secret_dir }}"
+ state: directory
+ mode: '0775'
+
+ - name: Generate self-signed certs
+ command: "{{ magma_root }}/orc8r/cloud/deploy/scripts/self_sign_certs.sh {{ orc8r_domain_name }}"
+ args:
+ chdir: "{{ secret_dir }}"
+ tags: self_signed
+
+ - name: Generate application certs
+ command: "{{ magma_root }}/orc8r/cloud/deploy/scripts/create_application_certs.sh {{ orc8r_domain_name }}"
+ args:
+ chdir: "{{ secret_dir }}"
+
+ - name: Generate admin operator certs as pfx bundle
+ openssl_pkcs12:
+ action: export
+ path: "{{ secret_dir }}/admin_operator.pfx"
+ friendly_name: orc8rpfx
+ privatekey_path: "{{ secret_dir }}/admin_operator.key.pem"
+ certificate_path: "{{ secret_dir }}/admin_operator.pem"
+ state: present
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/cleanup.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/cleanup.yml
new file mode 100644
index 000000000000..e30019c98f4c
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/cleanup.yml
@@ -0,0 +1,10 @@
+- hosts: localhost
+ roles:
+ - role: deploy
+ - role: services/orc8r
+ - role: services
+ - role: platform
+ - role: infra/aws
+ vars_files:
+ - roles/deploy/vars/all.yml
+ - roles/services/vars/all.yml
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/main.yml
new file mode 100644
index 000000000000..179c60371f9d
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/main.yml
@@ -0,0 +1,10 @@
+- hosts: localhost
+ roles:
+ - role: deploy
+ - role: infra/aws
+ - role: platform
+ - role: services
+ - role: services/orc8r
+ vars_files:
+ - roles/deploy/vars/all.yml
+ - roles/services/vars/all.yml
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/main.yml
new file mode 100644
index 000000000000..8be463433194
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Secrets tasks
+ import_tasks: secrets.yml
+
+- name: Terraform tasks
+ import_tasks: tf.yml
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/secrets.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/secrets.yml
new file mode 100644
index 000000000000..b4d880982be2
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/secrets.yml
@@ -0,0 +1,20 @@
+- name: Get information from secrets directory
+ stat:
+ path: "{{secret_dir}}/{{item}}"
+ register: st_info
+ with_items: "{{ ORC8R_CERTS + FLUENTD_CERTS + ADMIN_CERTS}}"
+ tags:
+ - install_precheck
+
+- name: Debug secrets
+ debug: msg="{{st_info}}"
+ tags:
+ - install_precheck
+
+- name: Check if secrets are missing
+ assert:
+ that: "{{item.stat.exists}}"
+ fail_msg: "Secret file {{item.item}} does not exist"
+ with_items: "{{st_info.results}}"
+ tags:
+ - install_precheck
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/tf.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/tf.yml
new file mode 100644
index 000000000000..089224bbbbf3
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/tasks/tf.yml
@@ -0,0 +1,287 @@
+- name: Initialize terraform
+ ansible.builtin.command: terraform init
+ args:
+ chdir: "{{project_dir}}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Get terraform state facts
+ ansible.builtin.command: "{% if cleanup_state is defined %} terraform show -json {{cleanup_state}} {% else %} terraform show -json {% endif %}"
+ register: result
+ args:
+ chdir: "{{project_dir}}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Check if terraform state command errors out
+ assert:
+ that:
+ - result.rc == 0
+ msg: [
+ "Error attempting to run 'terraform show' command",
+ "Terraform state not found",
+ "Check if the deployment directory {{project_dir}} contains terraform files"
+ ]
+ tags:
+ - install_precheck
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Check if any resources are present in terraform state
+ assert:
+ that:
+ - "{{ (result.stdout | from_json) | json_query('values') != None }}"
+ msg: [
+ "No resources found in terraform state"
+ ]
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+
+- name: Check if no resources are present in terraform state
+ assert:
+ that:
+ - "{{ (result.stdout | from_json) | json_query('values') == None }}"
+ fail_msg: "Prior terraform state present. Cleanup terraform.tfstate files or backend s3 state if necessary"
+ tags:
+ - install_precheck
+
+- name: Set terraform state fact
+ set_fact:
+ terraform_state: "{{result.stdout | from_json}}"
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r namespace
+ set_fact:
+ orc8r_namespace: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_NAMESPACE_QUERY))}}"
+ when: orc8r_namespace is undefined
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r namespace
+ debug:
+ msg: "orc8r_namespace : {{orc8r_namespace}}"
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r secrets
+ set_fact:
+ orc8r_secrets: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_AWS_SECRETS_QUERY))}}"
+ ignore_errors: true
+ when: orc8r_secrets is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r secrets
+ debug:
+ msg: "orc8r_secrets : {{orc8r_secrets}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r ES domain
+ set_fact:
+ orc8r_es_domain: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_ES_DOMAIN_QUERY))}}"
+ ignore_errors: true
+ when: orc8r_es_domain is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r es domain
+ debug:
+ msg: "orc8r_es_domain : {{orc8r_es_domain}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r cluster name
+ set_fact:
+ orc8r_cluster_name: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_CLUSTER_NAME_QUERY))}}"
+ when: orc8r_cluster_name is undefined
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r cluster name
+ debug:
+ msg: "orc8r_cluster_name : {{orc8r_cluster_name}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r db instance id
+ set_fact:
+ orc8r_db_id: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_DB_ID_QUERY))}}"
+ when: orc8r_db_id is undefined
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r db instance
+ debug:
+ msg: "orc8r_db_id : {{orc8r_db_id}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set orc8r db subnet
+ set_fact:
+ orc8r_db_subnet: "{{lookup('flattened', result.stdout | from_json | json_query(ORC8R_DB_SUBNET_QUERY))}}"
+ ignore_errors: true
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug orc8r db subnet
+ debug:
+ msg: "orc8r_db_subnet : {{orc8r_db_subnet}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set EFS mount targets
+ set_fact:
+ efs_mount_targets: "{{lookup('flattened', result.stdout | from_json | json_query(EFS_MOUNT_TARGET_ID_QUERY), wantlist=True)}}"
+ ignore_errors: true
+ when: efs_mount_targets is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug EFS mount targets
+ debug:
+ msg: "efs_mount_targets : {{efs_mount_targets}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set EFS FS targets
+ set_fact:
+ efs_fs_targets: "{{lookup('flattened', result.stdout | from_json | json_query(EFS_FILE_SYSTEM_ID_QUERY), wantlist=True)}}"
+ ignore_errors: true
+ when: efs_fs_targets is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug EFS FS targets
+ debug:
+ msg: "efs_fs_targets : {{efs_fs_targets}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set vpc
+ set_fact:
+ vpc: "{{lookup('flattened', result.stdout | from_json | json_query(VPC_QUERY))}}"
+ ignore_errors: true
+ when: vpc is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug vpc
+ debug:
+ msg: "vpc : {{vpc}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set hosted zone
+ set_fact:
+ hosted_zone: "{{lookup('flattened', result.stdout | from_json | json_query(HOSTED_ZONE_QUERY))}}"
+ ignore_errors: true
+ when: hosted_zone is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug hosted zone
+ debug:
+ msg: "hosted_zone : {{hosted_zone}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Set region name
+ set_fact:
+ region_name: "{{lookup('flattened', result.stdout | from_json | json_query(REGION_QUERY) | first)}}"
+ ignore_errors: true
+ when: region_name is undefined
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug region name
+ debug:
+ msg: "region_name : {{region_name}}"
+ tags:
+ - upgrade_precheck
+ - verify_sanity
+ - cleanup_dryrun
+ - cleanup
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/vars/all.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/vars/all.yml
new file mode 100644
index 000000000000..0d23222e6edd
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/deploy/vars/all.yml
@@ -0,0 +1,29 @@
+ORC8R_NAMESPACE_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r-app.kubernetes_namespace.orc8r'].values.metadata[*].name"
+ORC8R_AWS_SECRETS_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r.aws_secretsmanager_secret.orc8r_secrets'].values.name"
+ORC8R_ES_DOMAIN_QUERY: "values.root_module.child_modules[*].resources[?type=='aws_elasticsearch_domain'].values.domain_name"
+ORC8R_CLUSTER_NAME_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r-app.data.aws_eks_cluster.cluster'].values.name"
+ORC8R_DB_ID_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r.aws_db_instance.default'].values.id"
+ORC8R_DB_SUBNET_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r.aws_db_instance.default'].values.db_subnet_group_name"
+NMS_DB_ID_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r.aws_db_instance.nms'].values.id"
+EFS_MOUNT_TARGET_ID_QUERY: "values.root_module.child_modules[*].resources[?type=='aws_efs_mount_target'].values.id"
+EFS_FILE_SYSTEM_ID_QUERY: "values.root_module.child_modules[*].resources[?type=='aws_efs_mount_target'].values.file_system_id"
+HOSTED_ZONE_QUERY: "values.root_module.child_modules[*].resources[?address=='module.orc8r.aws_route53_zone.orc8r'].values"
+VPC_QUERY: "values.root_module.child_modules[*].child_modules[*].resources[?type=='aws_vpc'].values"
+REGION_QUERY: "values.root_module.child_modules[*].resources[?type=='aws_availability_zones'].values.id"
+
+ORC8R_CERTS:
+ - 'rootCA.pem'
+ - 'rootCA.key'
+ - 'controller.key'
+ - 'controller.crt'
+ - 'certifier.key'
+ - 'certifier.pem'
+ - 'bootstrapper.key'
+
+FLUENTD_CERTS:
+ - 'fluentd.key'
+ - 'fluentd.pem'
+
+ADMIN_CERTS:
+ - 'admin_operator.pem'
+ - 'admin_operator.key.pem'
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/az.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/az.yml
new file mode 100644
index 000000000000..f16364ee7bfd
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/az.yml
@@ -0,0 +1,15 @@
+- name: Check if we have atleast 3 availability zones in our deployment
+ amazon.aws.aws_az_info:
+ register: aws_az_info
+ failed_when: aws_az_info.availability_zones | length < 3
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Debug availability zones present in our region
+ amazon.aws.aws_az_info:
+ register: aws_az_info
+ failed_when: aws_az_info.availability_zones | length < 3
+ tags:
+ - install_precheck
+ - upgrade_precheck
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/efs.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/efs.yml
new file mode 100644
index 000000000000..d5122e7cc7f6
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/efs.yml
@@ -0,0 +1,19 @@
+- name: Delete efs mount targets
+ command: aws efs delete-mount-target --mount-target-id "{{ item }}"
+ with_items: "{{ efs_mount_targets }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Sleep for a while before deleting filesystem
+ pause:
+ minutes: 2
+ when: efs_mount_targets
+ tags: cleanup
+
+- name: Delete efs volumes
+ command: aws efs delete-file-system --file-system-id "{{ item }}"
+ with_items: "{{ efs_fs_targets }}"
+ ignore_errors: true
+ when: efs_fs_targets
+ tags: cleanup
+
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/eks.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/eks.yml
new file mode 100644
index 000000000000..5b5eaa6914c0
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/eks.yml
@@ -0,0 +1,56 @@
+- name: Get EKS cluster information
+ ansible.builtin.shell: aws eks describe-cluster --name {{ infra_configs.cluster_name | quote }} || /bin/true
+ register: result
+ tags: upgrade_precheck
+
+- name: Check if deployed EKS cluster version is greater than version specified in values
+ assert:
+ that: "{{ infra_configs.cluster_version is version((result.stdout | from_json).cluster.version, '>=') }}"
+ msg:
+ - "deployed version higher than to be configured version"
+ - "Configure the cluster_version to be >= {{(result.stdout | from_json).cluster.version}}"
+ - "For e.g: orcl configure set -c infra -k cluster_version -v {{(result.stdout | from_json).cluster.version}}"
+ when: '"ResourceNotFoundException" not in result.stderr'
+ tags: upgrade_precheck
+
+- name: Cleanup eks cluster
+ aws_eks_cluster:
+ name: "{{ orc8r_cluster_name }}"
+ wait: yes
+ state: absent
+ ignore_errors: true
+ tags:
+ - cleanup
+
+- name: Get autoscaling groups
+ ec2_asg_info:
+ tags:
+ k8s.io/cluster-autoscaler/orc8r: "{{ orc8r_cluster_name }}"
+ register: asg_cluster_info
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug autoscaling groups
+ debug:
+ msg: "{{ asg_cluster_info }}"
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Set autoscaling group fact
+ set_fact:
+ asg_name: "{{ asg_cluster_info.results[0].auto_scaling_group_name }}"
+ ignore_errors: true
+ when: asg_cluster_info.results | length
+ tags:
+ - cleanup
+
+- name: Delete autoscaling group
+ command: aws autoscaling delete-auto-scaling-group --auto-scaling-group-name "{{ asg_name }}" --force-delete
+ ignore_errors: true
+ when: asg_cluster_info.results | length
+ tags:
+ - cleanup
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/elb.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/elb.yml
new file mode 100644
index 000000000000..3c19a19e6c5a
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/elb.yml
@@ -0,0 +1,33 @@
+- name: Collect all elb information
+ ec2_elb_info:
+ region: "{{ region_name }}"
+ register: elb_info
+ ignore_errors: true
+ when: region_name
+ tags:
+ - cleanup_dryrun
+ - cleanup
+
+- name: Debug elb information
+ debug:
+ msg: "{{item}}"
+ ignore_errors: true
+ when: region_name and vpc and item.vpc_id == vpc.id
+ with_items:
+ - "{{ elb_info.elbs }}"
+ tags:
+ - cleanup_dryrun
+ - cleanup
+
+- name: Delete all elbs
+ ec2_elb_lb:
+ state: absent
+ name: "{{ item.name }}"
+ region: "{{ region_name }}"
+ wait: yes
+ when: region_name and vpc and item.vpc_id == vpc.id
+ ignore_errors: true
+ with_items:
+ - "{{ elb_info.elbs }}"
+ tags:
+ - cleanup
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/main.yml
new file mode 100644
index 000000000000..c901d4108220
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/main.yml
@@ -0,0 +1,42 @@
+- name: Check if required infra variables are set
+ ansible.builtin.command: "orcl configure check -c infra"
+ register: result
+ failed_when: result.rc != 0
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Open configuration file
+ shell: "cat {{config_dir}}/infra.tfvars.json"
+ register: result
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Set Infra Configs
+ set_fact:
+ infra_configs: "{{ result.stdout | from_json }}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Availability zone tasks
+ import_tasks: az.yml
+
+- name: Secret manager tasks
+ import_tasks: secrets.yml
+
+- name: EKS tasks
+ import_tasks: eks.yml
+
+- name: ELB tasks
+ import_tasks: elb.yml
+
+- name: EFS tasks
+ import_tasks: efs.yml
+
+- name: VPC tasks
+ import_tasks: vpc.yml
+
+- name: Route53 tasks
+ import_tasks: route53.yml
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/route53.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/route53.yml
new file mode 100644
index 000000000000..1e8d4319f288
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/route53.yml
@@ -0,0 +1,109 @@
+- name: Get all txt resource record sets
+ community.aws.route53:
+ command: get
+ zone: "{{hosted_zone.name}}"
+ record: "{{item[0]}}.{{hosted_zone.name}}"
+ type: "TXT"
+ register: current_dns_records
+ ignore_errors: true
+ with_items: ['bootstrapper-controller', 'controller', '*.nms', 'fluentd', 'api']
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug all txt resource record sets
+ debug: msg="{{current_dns_records}}"
+ tags:
+ - cleanup_dryrun
+ - cleanup
+
+# HACK - deleting a record fails due to some oddities in value. Hence
+# setting to a empty value and deleting it.
+- name: Change all txt resource record sets
+ community.aws.route53:
+ state: present
+ overwrite: true
+ zone: "{{ hosted_zone.name }}"
+ record: "{{item.item}}.{{hosted_zone.name}}"
+ ttl: "{{ item.set.ttl | default('300') }}"
+ type: "TXT"
+ value: "{{ value | to_json }}"
+ wait: yes
+ loop: "{{ current_dns_records.results }}"
+ ignore_errors: true
+ vars:
+ value: ""
+ tags: cleanup
+
+- name: Delete all txt resource record sets
+ community.aws.route53:
+ state: absent
+ overwrite: true
+ zone: "{{ hosted_zone.name }}"
+ record: "{{item.item}}.{{hosted_zone.name}}"
+ ttl: "{{ item.set.ttl | default('300') }}"
+ type: "TXT"
+ value: "{{ value | to_json }}"
+ wait: yes
+ vars:
+ value: ""
+ loop: "{{ current_dns_records.results }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Get all alias resource record sets
+ community.aws.route53:
+ command: get
+ zone: "{{hosted_zone.name}}"
+ record: "{{item[0]}}.{{hosted_zone.name}}"
+ type: "A"
+ register: current_dns_records
+ ignore_errors: true
+ with_items: ['bootstrapper-controller', 'controller', '*.nms', 'fluentd', 'api']
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug all alias resource record sets
+ debug: msg="{{current_dns_records}}"
+ tags:
+ - cleanup_dryrun
+ - cleanup
+
+# HACK - deleting a record fails due to some oddities in value. Hence
+# setting to a empty value and deleting it.
+- name: Change all alias resource record sets
+ community.aws.route53:
+ state: present
+ overwrite: true
+ zone: "{{ hosted_zone.name }}"
+ record: "{{item.item}}.{{hosted_zone.name}}"
+ ttl: "{{ item.set.ttl | default('300') }}"
+ type: "A"
+ value: 0.0.0.0
+ wait: yes
+ loop: "{{ current_dns_records.results }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Delete all alias resource record sets
+ community.aws.route53:
+ state: absent
+ overwrite: true
+ zone: "{{ hosted_zone.name }}"
+ record: "{{item.item}}.{{hosted_zone.name}}"
+ ttl: "{{ item.set.ttl | default('300') }}"
+ type: "A"
+ value: 0.0.0.0
+ wait: yes
+ loop: "{{ current_dns_records.results }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Delete hosted zones for orc8r domain
+ community.aws.route53_zone:
+ zone: "{{hosted_zone.name}}"
+ hosted_zone_id: "{{hosted_zone.zone_id}}"
+ state: absent
+ ignore_errors: true
+ tags: cleanup
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/secrets.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/secrets.yml
new file mode 100644
index 000000000000..622ccfeb1fd0
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/secrets.yml
@@ -0,0 +1,19 @@
+- name: Query secretsmanager
+ ansible.builtin.shell: aws secretsmanager list-secret-version-ids --secret-id {{ infra_configs.secretsmanager_orc8r_secret | quote }} || /bin/true
+ register: result
+ tags: install_precheck
+
+- name: Verify if secrets already present
+ assert:
+ that: '"ResourceNotFoundException" in result.stderr'
+ fail_msg:
+ - "secret {{ infra_configs.secretsmanager_orc8r_secret}} already present"
+ - "Remove secrets 'aws secretsmanager delete-secret --force-delete --secret-id {{ infra_configs.secretsmanager_orc8r_secret | quote }}'"
+ tags: install_precheck
+
+- name: Delete secretsmanager forcefully
+ command: aws secretsmanager delete-secret --force-delete --secret-id "{{ orc8r_secrets }}"
+ when: orc8r_secrets
+ ignore_errors: true
+ tags:
+ - cleanup
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/vpc.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/vpc.yml
new file mode 100644
index 000000000000..87b0b3202847
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/infra/aws/tasks/vpc.yml
@@ -0,0 +1,157 @@
+- name: Get all NAT gateways for this VPC
+ ec2_vpc_nat_gateway_info:
+ filters:
+ vpc-id: "{{ vpc.id }}"
+ register: natgw_info
+ when: vpc
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug NAT gateways for this vpc
+ when: vpc
+ debug: msg="{{natgw_info}}"
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Delete all nat gateways
+ ec2_vpc_nat_gateway:
+ state: absent
+ nat_gateway_id: "{{ item.nat_gateway_id }}"
+ release_eip: true
+ wait: yes
+ when: vpc
+ with_items: "{{ natgw_info.result }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Get all internet gateways attached to this VPC
+ ec2_vpc_igw_info:
+ filters:
+ "tag:Name": "{{ vpc.tags['Name'] }}"
+ "attachment.state": "available"
+ register: igw_info
+ when: vpc
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug internet gateways for this vpc
+ debug: msg="{{igw_info}}"
+ when: vpc
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Detach internet gateway from VPC
+ command: aws ec2 detach-internet-gateway --internet-gateway-id "{{ item.internet_gateway_id }}" --vpc-id "{{ vpc.id }}"
+ ignore_errors: true
+ when: vpc
+ with_items: "{{igw_info.internet_gateways}}"
+ tags: cleanup
+
+- name: Delete internet gateway
+ command: aws ec2 delete-internet-gateway --internet-gateway-id "{{ item.internet_gateway_id }}"
+ ignore_errors: true
+ when: vpc
+ with_items: "{{igw_info.internet_gateways}}"
+ tags: cleanup
+
+- name: Find subnets of this vpc
+ ec2_vpc_subnet_info:
+ filters:
+ vpc-id: "{{ vpc.id }}"
+ when: vpc
+ register: subnet_info
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug all subnets
+ debug:
+ msg: "{{subnet_info}}"
+ when: vpc
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Delete all subnets
+ ec2_vpc_subnet:
+ state: absent
+ vpc_id: "{{ item.vpc_id }}"
+ cidr: "{{ item.cidr_block }}"
+ when: item.default_for_az == false
+ with_items: "{{ subnet_info.subnets }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Get all route tables for this subnet
+ ec2_vpc_route_table_info:
+ filters:
+ vpc_id: "{{ vpc.id }}"
+ region: "{{ region_name }}"
+ register: rt_info
+ when: vpc
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug routing info
+ debug:
+ msg: "{{ rt_info }}"
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Delete all route tables for this vpc
+ command: aws ec2 delete-route-table --route-table-id "{{ item.id }}"
+ when: item.associations[0] is not defined
+ with_items:
+ - "{{ rt_info.route_tables }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Get all security groups for this vpc
+ ec2_group_info:
+ filters:
+ vpc_id: "{{ vpc.id }}"
+ register: sec_info
+ when: vpc
+ ignore_errors: true
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Debug security groups
+ debug:
+ msg: "{{ sec_info }}"
+ tags:
+ - cleanup
+ - cleanup_dryrun
+
+- name: Delete all security groups in this VPC
+ ec2_group:
+ group_id: "{{ item.group_id }}"
+ state: absent
+ when: vpc and item.group_name != "default"
+ with_items:
+ - "{{ sec_info.security_groups }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Delete vpc
+ ec2_vpc_net:
+ state: absent
+ name: "{{ vpc.tags['Name'] }}"
+ cidr_block: "{{ vpc.cidr_block }}"
+ ignore_errors: true
+ when: vpc
+ tags: cleanup
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/cloudwatch.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/cloudwatch.yml
new file mode 100644
index 000000000000..e88866af55d2
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/cloudwatch.yml
@@ -0,0 +1,33 @@
+---
+- name: Check if required infra variables are set
+ ansible.builtin.command: "orcl configure check -c infra"
+ register: result
+ failed_when: result.rc != 0
+ tags: install_precheck
+
+- name: Open configuration file
+ shell: "cat {{ config_dir }}/infra.tfvars.json"
+ register: result
+ tags: install_precheck
+
+- name: Set Infra Configs
+ set_fact:
+ infra_configs: "{{ result.stdout | from_json }}"
+ tags: install_precheck
+
+- name: Get all cloudwatch log groups
+ ansible.builtin.shell: aws logs describe-log-groups --output json
+ register: result
+ tags: install_precheck
+
+- name: Check if orc8r cloudwatch log group exists
+ fail:
+ msg: "Cloudwatch Log group still exists"
+ when: '"eks/{{infra_configs.cluster_name}}/cluster" in item.logGroupName'
+ with_items: "{{ (result.stdout|from_json).logGroups }}"
+ tags: install_precheck
+
+- name: Delete orchestrator cloudwatch group
+ command: aws logs delete-log-group --log-group-name "/aws/eks/{{ orc8r_cluster_name }}/cluster"
+ ignore_errors: true
+ tags: cleanup
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/elastic.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/elastic.yml
new file mode 100644
index 000000000000..693a66403a23
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/elastic.yml
@@ -0,0 +1,30 @@
+- name: Get AWS IAM roles information
+ ansible.builtin.shell: aws iam list-roles || /bin/true
+ register: result
+ when: platform_configs.deploy_elasticsearch
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Check if AWSServiceRoleForAmazonElasticsearchService is present already
+ assert:
+ that:
+ - "{{ platform_configs.deploy_elasticsearch_service_linked_role not in (true, 'true') or item.RoleName != 'AWSServiceRoleForAmazonElasticsearchService' }}"
+ msg:
+ - "IAM role AWSServiceRoleForAmazonElasticsearchService already exists"
+ - "Configure deploy_elasticsearch_service_linked_role to be false"
+ - "For e.g: orcl configure set -c platform -k deploy_elasticsearch_service_linked_role -v false"
+ when: platform_configs.deploy_elasticsearch
+ with_items: "{{(result.stdout | from_json).Roles}}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Cleanup elastic search instance
+ command: aws es delete-elasticsearch-domain --domain-name "{{ orc8r_es_domain }}"
+ ignore_errors: true
+ when: orc8r_es_domain
+ tags:
+ - cleanup
+
+
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/main.yml
new file mode 100644
index 000000000000..81e55380925d
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/main.yml
@@ -0,0 +1,30 @@
+- name: Check if required platform variables are set
+ ansible.builtin.command: "orcl configure check -c platform"
+ register: result
+ failed_when: result.rc != 0
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Open configuration file
+ shell: "cat {{config_dir}}/platform.tfvars.json"
+ register: result
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Set platform Configs
+ set_fact:
+ platform_configs: "{{ result.stdout | from_json }}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Cloudwatch tasks
+ import_tasks: cloudwatch.yml
+
+- name: RDS tasks
+ import_tasks: rds.yml
+
+- name: Elastic tasks
+ import_tasks: elastic.yml
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/rds.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/rds.yml
new file mode 100644
index 000000000000..3222022c2f6c
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/platform/tasks/rds.yml
@@ -0,0 +1,39 @@
+- name: Get RDS information
+ ansible.builtin.shell: aws rds describe-db-instances || /bin/true
+ register: result
+ tags: upgrade_precheck
+
+- name: Check if deployed RDS db instance version is greater than version specified in values
+ assert:
+ that: "{{ platform_configs.orc8r_db_engine_version is version(item.EngineVersion, '>=') }}"
+ msg:
+ - "deployed version higher than to be configured version"
+ - "Configure the db engine version to be >= {{item.EngineVersion}}"
+ - "For e.g: orcl configure set -c infra -k orc8r_db_engine_version -v {{item.EngineVersion}}"
+ when: item.DBInstanceIdentifier == platform_configs.orc8r_db_identifier
+ with_items: "{{(result.stdout | from_json).DBInstances}}"
+ tags: upgrade_precheck
+
+- name: Delete rds instances
+ command: aws rds delete-db-instance --db-instance-identifier "{{ item }}" --skip-final-snapshot
+ when: item
+ with_items:
+ - "{{ orc8r_db_id }}"
+ # - "{{ nms_db_id }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Wait for database deletion before deleting subnet group
+ command: aws rds wait db-instance-deleted --db-instance-identifier "{{ item }}"
+ when: item
+ with_items:
+ - "{{ orc8r_db_id }}"
+ # - "{{ nms_db_id }}"
+ ignore_errors: true
+ tags: cleanup
+
+- name: Delete rds subnet group
+ command: aws rds delete-db-subnet-group --db-subnet-group-name "{{ orc8r_db_subnet }}"
+ ignore_errors: true
+ when: orc8r_db_subnet
+ tags: cleanup
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/orc8r/tasks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/orc8r/tasks/main.yml
new file mode 100644
index 000000000000..9cb1f5aa1335
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/orc8r/tasks/main.yml
@@ -0,0 +1,82 @@
+- name: Gather kubernetes pod status for orc8r namespace
+ ansible.builtin.shell: kubectl get pods -o json -n "{{orc8r_namespace}}"
+ register: kubectl_output
+ tags: verify_sanity
+
+- name: Check if any pods are unhealthy
+ assert:
+ that:
+ - "{{pod_status | length == 0}}"
+ fail_msg: "found pods {{pod_status}} not in running state"
+ vars:
+ status_query: "items[?status.phase != 'Running'].metadata.name"
+ pod_status: "{{kubectl_output.stdout | from_json | json_query(status_query)}}"
+ tags: verify_sanity
+
+- name: Get the logs for pods in unhealthy state
+ ansible.builtin.shell: kubectl -n "{{orc8r_namespace}}" logs --tail=50 "{{item}}"
+ register: result
+ vars:
+ status_query: "items[?status.phase != 'Running'].metadata.name"
+ pod_status: "{{kubectl_output.stdout | from_json | json_query(status_query)}}"
+ with_items: "{{pod_status}}"
+ tags: verify_sanity
+
+- name: Dump the logs for pods in unhealthy state
+ debug: msg="Logs for {{item.item}} \n {{item.stdout_lines}}"
+ with_items: "{{result.results}}"
+ tags: verify_sanity
+
+- name: Get orchestrator pod name
+ ansible.builtin.shell: kubectl get pod -n "{{orc8r_namespace}}" -l app.kubernetes.io/component=orchestrator -o json
+ register: result
+ tags: verify_sanity
+
+- name: Set orchestrator pod name
+ set_fact:
+ orc_pod: "{{result.stdout | from_json | json_query(pod_query)}}"
+ vars:
+ pod_query: "items[0].metadata.name"
+
+ tags:
+ - 'verify_sanity'
+
+- name: Get NMS pod name
+ ansible.builtin.shell: kubectl get pod -n "{{orc8r_namespace}}" -l app.kubernetes.io/component=magmalte -o json
+ register: result
+ tags: verify_sanity
+
+- name: Set orchestrator pod name
+ set_fact:
+ nms_pod: "{{result.stdout | from_json | json_query(pod_query)}}"
+ api_host: "{{lookup('flattened', result.stdout | from_json | json_query(api_host_query))}}"
+ api_cert: "{{lookup('flattened', result.stdout | from_json | json_query(api_cert_query))}}"
+ api_key: "{{lookup('flattened', result.stdout | from_json | json_query(api_key_query))}}"
+ vars:
+ pod_query: "items[0].metadata.name"
+ api_host_query: "items[0].spec.containers[*].env[?name == 'API_HOST'].value"
+ api_cert_query: "items[0].spec.containers[*].env[?name == 'API_CERT_FILENAME'].value"
+ api_key_query: "items[0].spec.containers[*].env[?name == 'API_PRIVATE_KEY_FILENAME'].value"
+ tags:
+ - 'verify_sanity'
+
+- name: Add admin cert to orchestrator pod
+ ansible.builtin.shell: kubectl -n "{{orc8r_namespace}}" exec "{{orc_pod}}" -- envdir /var/opt/magma/envdir /var/opt/magma/bin/accessc add-existing -admin -cert /var/opt/magma/certs/admin_operator.pem admin_operator
+ register: result
+ failed_when: result.rc != 0 and 'AlreadyExists' not in result.stderr
+ tags: verify_sanity
+
+
+- name: List admin certs in orchestrator pod
+ ansible.builtin.shell: kubectl -n "{{orc8r_namespace}}" exec "{{orc_pod}}" -- envdir /var/opt/magma/envdir /var/opt/magma/bin/accessc list-certs
+ register: result
+ failed_when: result.rc != 0 or 'admin_operator' not in result.stdout
+ tags: verify_sanity
+
+- name: Get all configured networks from NMS pod
+ ansible.builtin.shell: kubectl -n "{{orc8r_namespace}}" exec "{{nms_pod}}" -- curl --cert "{{api_cert}}" --key "{{api_key}}" -k -X GET https://"{{api_host}}"/"{{item}}"
+ register: result
+ tags: verify_sanity
+ with_items:
+ - magma/v1/networks
+ - magma/v1/lte
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/docker.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/docker.yml
new file mode 100644
index 000000000000..9df271e97135
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/docker.yml
@@ -0,0 +1,17 @@
+- name: Verify image credentials
+ docker_login:
+ registry: "{{service_configs.docker_registry}}"
+ username: "{{service_configs.docker_user}}"
+ password: "{{service_configs.docker_pass}}"
+ reauthorize: yes
+ tags: install_precheck
+
+- name: Attempting to pull the images
+ docker_image:
+ tag: "{{service_configs.orc8r_tag}}"
+ name: "{{service_configs.docker_registry}}/{{item}}"
+ force_source: true
+ source: pull
+ tags: install_precheck
+ with_items:
+ - "{{vars.ORC8R_IMAGES}}"
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/helm.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/helm.yml
new file mode 100644
index 000000000000..85258c4f39a8
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/helm.yml
@@ -0,0 +1,90 @@
+- name: Set helm repo credentials
+ set_fact:
+ helm_cred_options: ""
+ when: service_configs.helm_user
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Verify the Helm repo
+ ansible.builtin.shell: "helm repo add test {{service_configs.helm_repo}} {% if service_configs.helm_user != '' %} --username {{service_configs.helm_user}} --password {{service_configs.helm_pass}} {% endif %}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Get all charts present in the Helm repo
+ ansible.builtin.shell: helm search repo test -o json
+ register: helm_chart_info
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Get chart name and version from Helm list
+ set_fact:
+ chart_version_map: "{{ chart_version_map | default({}) | combine({item.name.split('/')[1]: item.version}) }}"
+ with_items: "{{ helm_chart_info.stdout }}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Set chart version map
+ set_fact:
+ exp_chart_version_map: "{{ exp_chart_version_map | default({}) | combine({item.name: item.version}) }}"
+ with_items:
+ - { name: orc8r, version: "{{service_configs.orc8r_chart_version}}"}
+ - { name: lte-orc8r, version: "{{service_configs.lte_orc8r_chart_version}}" }
+ - { name: feg-orc8r, version: "{{service_configs.feg_orc8r_chart_version}}" }
+ - { name: cwf-orc8r, version: "{{service_configs.cwf_orc8r_chart_version}}" }
+ - { name: fbinternal-orc8r, version: "{{service_configs.fbinternal_orc8r_chart_version}}" }
+ - { name: wifi-orc8r, version: "{{service_configs.wifi_orc8r_chart_version}}" }
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Deployment to module mapping
+ set_fact:
+ deployment_module_map: "{{ deployment_module_map | default({}) | combine({item.name: item.modules}) }}"
+ with_items:
+ - { name: fwa, modules: ['orc8r', 'lte-orc8r']}
+ - { name: ffwa, modules: ['orc8r', 'lte-orc8r', 'feg-orc8r'] }
+ - { name: all, modules: ['orc8r', 'lte-orc8r', 'feg-orc8r', 'cwf-orc8r', 'fbinternal-orc8r', 'wifi-orc8r'] }
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Validate if necessary charts are present for deployment
+ assert:
+ that: item in chart_version_map
+ fail_msg: "{{item}} chart not found"
+ with_items: "{{deployment_module_map[service_configs.orc8r_deployment_type]}}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Validate if chart versions present match the expected version
+ assert:
+ that: chart_version_map[item] == exp_chart_version_map[item]
+ fail_msg: "{{item}} chart version mismatch expected version {{exp_chart_version_map[item]}} found version {{chart_version_map[item]}}"
+ with_items: "{{deployment_module_map[service_configs.orc8r_deployment_type]}}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Remove the test repo
+ ansible.builtin.shell: helm repo remove test
+ ignore_errors: yes
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Get list of installed charts
+ ansible.builtin.shell: helm list -o json -n "{{orc8r_namespace}}"
+ register: deployed_chart_info
+ tags: verify_sanity
+
+- name: Verify if charts have been deployed
+ assert:
+ that: item.status == "deployed"
+ fail_msg: "chart {{item.name}} status {{item.status}} not deployed successfully"
+ tags: verify_sanity
+ with_items: "{{deployed_chart_info.stdout}}"
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/main.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/main.yml
new file mode 100644
index 000000000000..166a68035602
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/tasks/main.yml
@@ -0,0 +1,35 @@
+- name: Check if required services variables are set
+ ansible.builtin.command: "orcl configure check -c service"
+ register: result
+ failed_when: result.rc != 0
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Open configuration file
+ shell: "cat {{ config_dir }}/service.tfvars.json"
+ register: result
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Set Service Configs
+ set_fact:
+ service_configs: "{{ result.stdout | from_json }}"
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Validate Orc8r deployment type
+ assert:
+ that: service_configs.orc8r_deployment_type in ['fwa', 'ffwa', 'all']
+ fail_msg: 'orc8r_deployment_type can only be one of these options [fwa, ffwa, all]'
+ tags:
+ - install_precheck
+ - upgrade_precheck
+
+- name: Image tasks
+ import_tasks: docker.yml
+
+- name: Helm tasks
+ import_tasks: helm.yml
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/vars/all.yml b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/vars/all.yml
new file mode 100644
index 000000000000..94189cc57776
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/playbooks/roles/services/vars/all.yml
@@ -0,0 +1,4 @@
+ORC8R_IMAGES:
+ - nginx
+ - controller
+ - magmalte
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/setup.py b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/setup.py
new file mode 100644
index 000000000000..6e1af6f997b2
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/scripts/setup.py
@@ -0,0 +1,28 @@
+"""
+Copyright 2021 The Magma Authors.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+from setuptools import setup, find_packages
+
+setup(
+ name='orcl',
+ version='0.1',
+ packages=['cli'],
+ include_package_data=True,
+ install_requires=[
+ 'Click',
+ ],
+ entry_points='''
+ [console_scripts]
+ orcl=cli.orcl:cli
+ ''',
+)
\ No newline at end of file
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/main.tf.j2 b/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/main.tf.j2
new file mode 100644
index 000000000000..e2c131375f2a
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/main.tf.j2
@@ -0,0 +1,54 @@
+################################################################################
+# Copyright 2020 The Magma Authors.
+
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+module "orc8r" {
+ source = "/root/magma/orc8r/cloud/deploy/terraform/orc8r-aws"
+
+ {% for k in cfg['infra'] %}
+ {{k}}=var.{{k}}
+ {% endfor %}
+
+ {% for k in cfg['platform'] %}
+ {{k}}=var.{{k}}
+ {% endfor %}
+}
+
+module "orc8r-app" {
+ source = "/root/magma/orc8r/cloud/deploy/terraform/orc8r-helm-aws"
+
+ {% for k in cfg['service'] %}
+ {{k}}=var.{{k}}
+ {% endfor %}
+
+ region = var.region
+ orc8r_domain_name = module.orc8r.orc8r_domain_name
+ orc8r_route53_zone_id = module.orc8r.route53_zone_id
+ external_dns_role_arn = module.orc8r.external_dns_role_arn
+ secretsmanager_orc8r_name = module.orc8r.secretsmanager_secret_name
+
+ orc8r_db_host = module.orc8r.orc8r_db_host
+ orc8r_db_port = module.orc8r.orc8r_db_port
+ orc8r_db_name = module.orc8r.orc8r_db_name
+ orc8r_db_user = module.orc8r.orc8r_db_user
+ orc8r_db_pass = module.orc8r.orc8r_db_pass
+ orc8r_db_dialect = module.orc8r.orc8r_db_dialect
+
+ eks_cluster_id = module.orc8r.eks_cluster_id
+ efs_file_system_id = module.orc8r.efs_file_system_id
+ efs_provisioner_role_arn = module.orc8r.efs_provisioner_role_arn
+ elasticsearch_endpoint = module.orc8r.es_endpoint
+}
+
+output "nameservers" {
+ value = module.orc8r.route53_nameservers
+}
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/vars.tf.j2 b/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/vars.tf.j2
new file mode 100644
index 000000000000..52603af3d558
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/root/tf/vars.tf.j2
@@ -0,0 +1,4 @@
+{% for k in cfg %}
+variable "{{k}}" {
+ default = {}
+}{% endfor %}
diff --git a/orc8r/cloud/deploy/orc8r_deployer/docker/run_deployer.bash b/orc8r/cloud/deploy/orc8r_deployer/docker/run_deployer.bash
new file mode 100755
index 000000000000..c8fa5845fa82
--- /dev/null
+++ b/orc8r/cloud/deploy/orc8r_deployer/docker/run_deployer.bash
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+set -euf -o pipefail
+
+print_help()
+{
+ echo "
+./run_deployer runs the orc8r deployer container
+orc8r deployer contains scripts which enable user to configure, run prechecks
+install, upgrade, verify and cleanup an orc8r deployment
+Usage: run_deployer [-deploy-dir|-root-dir|-build|-h]
+options:
+-h Print this Help
+-deploy-dir deployment dir containing configs and secrets (mandatory)
+-root-dir magma root directory
+-build build the deployer container
+example: ./run_deployer.bash -deploy-dir /tmp/orc8r_14_deployment"
+}
+
+if (( $# < 2 )); then
+ print_help
+ exit 1
+fi
+
+DOCKER_BUILD=false
+DEPLOY_WORKDIR=
+MAGMA_ROOT=
+while [ -n "${1-}" ]; do
+ case "$1" in
+ -deploy-dir)
+ DEPLOY_WORKDIR="$2"
+ shift
+ ;;
+ -root-dir)
+ MAGMA_ROOT="$2"
+ shift
+ ;;
+ -build)
+ DOCKER_BUILD=true
+ ;;
+ -h)
+ print_help
+ exit;;
+ *) echo "Option $1 not recognized"
+ print_help
+ exit;;
+ esac
+ shift
+done
+
+echo "Build $DOCKER_BUILD"
+
+echo "Deploy workddir $DEPLOY_WORKDIR"
+if [[ ! -d $DEPLOY_WORKDIR ]]; then
+ echo "${DEPLOY_WORKDIR} does not exist. Creating a new directory"
+ mkdir -p $DEPLOY_WORKDIR
+fi
+
+if [ -z $MAGMA_ROOT ]; then
+ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+ PATTERN='\/orc8r\/cloud\/deploy\/orc8r_deployer\/docker'
+ MAGMA_ROOT=${SCRIPT_DIR%%$PATTERN}
+ echo "Warning: inferring magma root($MAGMA_ROOT) from run_deployer script directory"
+fi
+
+if $DOCKER_BUILD; then
+ docker build -t orc8r_deployer:latest .
+fi
+
+if [[ $? -eq 0 ]]; then
+ docker run -it \
+ -v "${DEPLOY_WORKDIR}":/root/project \
+ -v "${MAGMA_ROOT}":/root/magma \
+ -v /var/run/docker.sock:/var/run/docker.sock \
+ --rm orc8r_deployer:latest bash
+fi
diff --git a/orc8r/cloud/deploy/terraform/orc8r-aws/README.md b/orc8r/cloud/deploy/terraform/orc8r-aws/README.md
index 88560408b080..0d71af3da4b5 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-aws/README.md
+++ b/orc8r/cloud/deploy/terraform/orc8r-aws/README.md
@@ -52,13 +52,6 @@ Everything below this line was generated by
| elasticsearch\_instance\_type | AWS instance type for ES domain. | `string` | `null` | no |
| elasticsearch\_version | ES version for ES domain. | `string` | `"7.1"` | no |
| global\_tags | n/a | `map` | `{}` | no |
-| nms\_db\_engine\_version | MySQL engine version for NMS DB. | `string` | `"5.7"` | no |
-| nms\_db\_identifier | Identifier for the RDS instance for NMS. | `string` | `"nmsdb"` | no |
-| nms\_db\_instance\_class | RDS instance type for NMS DB. | `string` | `"db.m4.large"` | no |
-| nms\_db\_name | DB name for NMS RDS instance. | `string` | `"magma"` | no |
-| nms\_db\_password | Password for the NMS DB. | `string` | n/a | yes |
-| nms\_db\_storage\_gb | Capacity in GB to allocate for NMS RDS instance. | `number` | `16` | no |
-| nms\_db\_username | Username for default DB user for NMS DB. | `string` | `"magma"` | no |
| orc8r\_db\_engine\_version | Postgres engine version for Orchestrator DB. | `string` | `"9.6.15"` | no |
| orc8r\_db\_identifier | Identifier for the RDS instance for Orchestrator. | `string` | `"orc8rdb"` | no |
| orc8r\_db\_instance\_class | RDS instance type for Orchestrator DB. | `string` | `"db.m4.large"` | no |
@@ -87,10 +80,6 @@ Everything below this line was generated by
| es\_endpoint | Endpoint of the ES cluster if deployed. |
| external\_dns\_role\_arn | IAM role ARN for external-dns |
| kubeconfig | kubectl config file to access the EKS cluster |
-| nms\_db\_host | Hostname of the NMS RDS instance |
-| nms\_db\_name | Database name for NMS RDS instance |
-| nms\_db\_pass | NMS DB password |
-| nms\_db\_user | Database username for NMS RDS instance |
| orc8r\_db\_host | Hostname of the Orchestrator RDS instance |
| orc8r\_db\_name | Database name for Orchestrator RDS instance |
| orc8r\_db\_pass | Orchestrator DB password |
diff --git a/orc8r/cloud/deploy/terraform/orc8r-aws/db.tf b/orc8r/cloud/deploy/terraform/orc8r-aws/db.tf
index 8abdfbde555d..f96fbbffe70c 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-aws/db.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-aws/db.tf
@@ -31,24 +31,3 @@ resource "aws_db_instance" "default" {
# this won't actually create a final snapshot on destroy
final_snapshot_identifier = "foo"
}
-
-resource "aws_db_instance" "nms" {
- identifier = var.nms_db_identifier
- allocated_storage = var.nms_db_storage_gb
- engine = "mysql"
- engine_version = var.nms_db_engine_version
- instance_class = var.nms_db_instance_class
-
- name = var.nms_db_name
- username = var.nms_db_username
- password = var.nms_db_password
-
- vpc_security_group_ids = [aws_security_group.default.id]
-
- db_subnet_group_name = module.vpc.database_subnet_group
-
- skip_final_snapshot = true
- # we only need this as a placeholder value for `terraform destroy` to work,
- # this won't actually create a final snapshot on destroy
- final_snapshot_identifier = "nms-foo"
-}
diff --git a/orc8r/cloud/deploy/terraform/orc8r-aws/examples/basic/main.tf b/orc8r/cloud/deploy/terraform/orc8r-aws/examples/basic/main.tf
index 9057a4feb4fb..093c541f35e8 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-aws/examples/basic/main.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-aws/examples/basic/main.tf
@@ -16,7 +16,6 @@ module orc8r {
region = "us-west-2"
- nms_db_password = "Faceb00k12345"
orc8r_db_password = "Faceb00k12345"
secretsmanager_orc8r_secret = "magma-orc8r-test"
deployment_secrets_bucket = "magma.orc8r.test"
diff --git a/orc8r/cloud/deploy/terraform/orc8r-aws/outputs.tf b/orc8r/cloud/deploy/terraform/orc8r-aws/outputs.tf
index e403cc2906ff..9d792fbce38c 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-aws/outputs.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-aws/outputs.tf
@@ -67,6 +67,11 @@ output "orc8r_db_port" {
value = aws_db_instance.default.port
}
+output "orc8r_db_dialect" {
+ description = "Database dialect for Orchestrator RDS instance"
+ value = var.orc8r_db_dialect
+}
+
output "orc8r_db_user" {
description = "Database username for Orchestrator RDS instance"
value = aws_db_instance.default.username
@@ -78,27 +83,6 @@ output "orc8r_db_pass" {
sensitive = true
}
-output "nms_db_host" {
- description = "Hostname of the NMS RDS instance"
- value = aws_db_instance.nms.address
-}
-
-output "nms_db_name" {
- description = "Database name for NMS RDS instance"
- value = aws_db_instance.nms.name
-}
-
-output "nms_db_user" {
- description = "Database username for NMS RDS instance"
- value = aws_db_instance.nms.username
-}
-
-output "nms_db_pass" {
- description = "NMS DB password"
- value = aws_db_instance.nms.password
- sensitive = true
-}
-
output "route53_zone_id" {
description = "Route53 zone ID for Orchestrator domain name"
value = aws_route53_zone.orc8r.id
diff --git a/orc8r/cloud/deploy/terraform/orc8r-aws/variables.tf b/orc8r/cloud/deploy/terraform/orc8r-aws/variables.tf
index 9c9de1807799..5f901ecc949b 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-aws/variables.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-aws/variables.tf
@@ -239,49 +239,10 @@ variable "orc8r_db_engine_version" {
default = "9.6.15"
}
-##############################################################################
-# NMS DB Specs
-##############################################################################
-
-variable "nms_db_identifier" {
- description = "Identifier for the RDS instance for NMS."
- type = string
- default = "nmsdb"
-}
-
-variable "nms_db_storage_gb" {
- description = "Capacity in GB to allocate for NMS RDS instance."
- type = number
- default = 16
-}
-
-variable "nms_db_instance_class" {
- description = "RDS instance type for NMS DB."
- type = string
- default = "db.m4.large"
-}
-
-variable "nms_db_name" {
- description = "DB name for NMS RDS instance."
- type = string
- default = "magma"
-}
-
-variable "nms_db_username" {
- description = "Username for default DB user for NMS DB."
- type = string
- default = "magma"
-}
-
-variable "nms_db_password" {
- description = "Password for the NMS DB. Must be at least 8 characters."
- type = string
-}
-
-variable "nms_db_engine_version" {
- description = "MySQL engine version for NMS DB."
+variable "orc8r_db_dialect" {
+ description = "Database dialect for Orchestrator DB."
type = string
- default = "5.7"
+ default = "postgres"
}
##############################################################################
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/README.md b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/README.md
index 01a43af6d609..6cd16e582cb1 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/README.md
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/README.md
@@ -53,10 +53,6 @@ Everything below this line was generated by
| install\_tiller | Install Tiller in the cluster or not. | `bool` | `true` | no |
| lte_orc8r\_chart\_version | Version of the Orchestrator lte module Helm chart to install. | `string` | 0.2.1 | yes |
| monitoring\_kubernetes\_namespace | K8s namespace to install Orchestrator monitoring components into. | `string` | `"monitoring"` | no |
-| nms\_db\_host | DB hostname for NMS database connection. | `string` | n/a | yes |
-| nms\_db\_name | DB name for NMS database connection. | `string` | n/a | yes |
-| nms\_db\_pass | NMS DB password. | `string` | n/a | yes |
-| nms\_db\_user | DB username for NMS database connection. | `string` | n/a | yes |
| orc8r\_chart\_version | Version of the core Orchestrator Helm chart to install. | `string` | 1.5.8 | yes |
| orc8r\_controller\_replicas | Replica count for Orchestrator controller pods. | `number` | `2` | no |
| orc8r\_db\_host | DB hostname for Orchestrator database connection. | `string` | n/a | yes |
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/efs.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/efs.tf
index 3c893fda7cfb..6c1acf2128a4 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/efs.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/efs.tf
@@ -13,7 +13,7 @@
# k8s requires provisioner to treat efs as a persistent volume
resource "helm_release" "efs_provisioner" {
- name = "efs-provisioner"
+ name = var.efs_provisioner_name
repository = local.stable_helm_repo
chart = "efs-provisioner"
version = "0.11.0"
@@ -27,7 +27,7 @@ resource "helm_release" "efs_provisioner" {
path: /pv-volume
provisionerName: aws-efs
storageClass:
- name: efs
+ name: ${var.efs_storage_class_name}
podAnnotations:
iam-assumable-role: ${var.efs_provisioner_role_arn}
VALUES
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/basic/main.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/basic/main.tf
index 64504b6f1e49..82f56d3931b8 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/basic/main.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/basic/main.tf
@@ -17,7 +17,6 @@ module "orc8r" {
region = "us-west-2"
- nms_db_password = "mypassword" # must be at least 8 characters
orc8r_db_password = "mypassword" # must be at least 8 characters
secretsmanager_orc8r_secret = "orc8r-secrets"
orc8r_domain_name = "orc8r.example.com"
@@ -50,15 +49,12 @@ module "orc8r-app" {
secretsmanager_orc8r_name = module.orc8r.secretsmanager_secret_name
seed_certs_dir = "~/secrets/certs"
- orc8r_db_host = module.orc8r.orc8r_db_host
- orc8r_db_name = module.orc8r.orc8r_db_name
- orc8r_db_user = module.orc8r.orc8r_db_user
- orc8r_db_pass = module.orc8r.orc8r_db_pass
-
- nms_db_host = module.orc8r.nms_db_host
- nms_db_name = module.orc8r.nms_db_name
- nms_db_user = module.orc8r.nms_db_user
- nms_db_pass = module.orc8r.nms_db_pass
+ orc8r_db_host = module.orc8r.orc8r_db_host
+ orc8r_db_port = module.orc8r.orc8r_db_port
+ orc8r_db_dialect = module.orc8r.orc8r_db_dialect
+ orc8r_db_name = module.orc8r.orc8r_db_name
+ orc8r_db_user = module.orc8r.orc8r_db_user
+ orc8r_db_pass = module.orc8r.orc8r_db_pass
# Note that this can be any container registry provider -- the example below
# provides the URL format for Docker Hub, where the user and pass are your
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/README.md b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/README.md
index 77111cc6cad0..a85c0e47fa7a 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/README.md
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/README.md
@@ -48,8 +48,6 @@ https://magma.github.io/magma.
| helm\_user | Username for your Helm repo | `string` | n/a | yes |
| metrics\_worker\_subnet\_id | Subnet ID of the metrics worker instance. Find this in the EC2 console (the instance will have the tag orc8r-node-type: orc8r-prometheus-node). | `string` | n/a | yes |
| new\_deployment\_name | New name for the v1.1.0 Helm deployment. This must be different than your old v1.0 deployment (which was probably 'orc8r') | `string` | n/a | yes |
-| nms\_db\_configuration | Configuration of the NMS MySQL instance. This should match the v1.0 Terraform. | object({
identifier = string
storage_gb = number
engine_version = string
instance_class = string
}) | {
"engine_version": "5.7",
"identifier": "nmsdb",
"instance_class": "db.m4.large",
"storage_gb": 16
} | no |
-| nms\_db\_password | Password for the NMS MySQL instance. This should match the v1.0 Terraform. | `string` | n/a | yes |
| orc8r\_chart\_version | Chart version for the Helm deployment | `string` | `"1.4.21"` | no |
| orc8r\_container\_tag | Container tag to deploy | `string` | n/a | yes |
| orc8r\_controller\_replicas | How many controller pod replicas to deploy | `number` | `2` | no |
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/main.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/main.tf
index d7930b78a339..73a0d9731618 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/main.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/main.tf
@@ -29,11 +29,6 @@ module orc8r {
orc8r_db_engine_version = var.orc8r_db_configuration.engine_version
orc8r_db_instance_class = var.orc8r_db_configuration.instance_class
orc8r_db_password = var.orc8r_db_password
- nms_db_identifier = var.nms_db_configuration.identifier
- nms_db_storage_gb = var.nms_db_configuration.storage_gb
- nms_db_engine_version = var.nms_db_configuration.engine_version
- nms_db_instance_class = var.nms_db_configuration.instance_class
- nms_db_password = var.nms_db_password
secretsmanager_orc8r_secret = var.secretsmanager_secret_name
@@ -118,15 +113,11 @@ module orc8r-app {
existing_tiller_service_account_name = "tiller"
helm_deployment_name = var.new_deployment_name
- orc8r_db_host = module.orc8r.orc8r_db_host
- orc8r_db_name = module.orc8r.orc8r_db_name
- orc8r_db_user = module.orc8r.orc8r_db_user
- orc8r_db_pass = module.orc8r.orc8r_db_pass
-
- nms_db_host = module.orc8r.nms_db_host
- nms_db_name = module.orc8r.nms_db_name
- nms_db_user = module.orc8r.nms_db_user
- nms_db_pass = module.orc8r.nms_db_pass
+ orc8r_db_host = module.orc8r.orc8r_db_host
+ orc8r_db_dialect = module.orc8r.orc8r_db_dialect
+ orc8r_db_name = module.orc8r.orc8r_db_name
+ orc8r_db_user = module.orc8r.orc8r_db_user
+ orc8r_db_pass = module.orc8r.orc8r_db_pass
docker_registry = var.docker_registry
docker_user = var.docker_user
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/variables.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/variables.tf
index 5be3a3def00a..a7fbca7a8911 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/variables.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/online-upgrade/variables.tf
@@ -51,27 +51,6 @@ variable "orc8r_db_password" {
type = string
}
-variable "nms_db_configuration" {
- description = "Configuration of the NMS MySQL instance. This should match the v1.0 Terraform."
- type = object({
- identifier = string
- storage_gb = number
- engine_version = string
- instance_class = string
- })
- default = {
- identifier = "nmsdb"
- storage_gb = 16
- engine_version = "5.7"
- instance_class = "db.m4.large"
- }
-}
-
-variable "nms_db_password" {
- description = "Password for the NMS MySQL instance. This should match the v1.0 Terraform."
- type = string
-}
-
variable "secretsmanager_secret_name" {
description = "Name for the Secretsmanager secret that the orc8r-aws module will create."
type = string
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/remote/main.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/remote/main.tf
index bd7a1e988b3c..636eb1a1c7cb 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/remote/main.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/examples/remote/main.tf
@@ -47,7 +47,6 @@ resource "aws_dynamodb_table" "terraform_locks" {
# This secretsmanager secret needs to be manually created and populated in the
# AWS console. For this example, you would set the following key-value pairs:
-# nms_db_pass
# orc8r_db_pass
# docker_registry
# docker_user
@@ -69,7 +68,6 @@ module "orc8r" {
region = local.region
- nms_db_password = jsondecode(data.aws_secretsmanager_secret_version.root_secrets.secret_string)["nms_db_pass"]
orc8r_db_password = jsondecode(data.aws_secretsmanager_secret_version.root_secrets.secret_string)["orc8r_db_pass"]
secretsmanager_orc8r_secret = "orc8r-secrets"
orc8r_domain_name = "orc8r.example.com"
@@ -113,15 +111,12 @@ module "orc8r-app" {
secretsmanager_orc8r_name = module.orc8r.secretsmanager_secret_name
seed_certs_dir = "~/orc8r.test.secrets/certs"
- orc8r_db_host = module.orc8r.orc8r_db_host
- orc8r_db_name = module.orc8r.orc8r_db_name
- orc8r_db_user = module.orc8r.orc8r_db_user
- orc8r_db_pass = module.orc8r.orc8r_db_pass
-
- nms_db_host = module.orc8r.nms_db_host
- nms_db_name = module.orc8r.nms_db_name
- nms_db_user = module.orc8r.nms_db_user
- nms_db_pass = module.orc8r.nms_db_pass
+ orc8r_db_host = module.orc8r.orc8r_db_host
+ orc8r_db_port = module.orc8r.orc8r_db_port
+ orc8r_db_dialect = module.orc8r.orc8r_db_dialect
+ orc8r_db_name = module.orc8r.orc8r_db_name
+ orc8r_db_user = module.orc8r.orc8r_db_user
+ orc8r_db_pass = module.orc8r.orc8r_db_pass
docker_registry = jsondecode(data.aws_secretsmanager_secret_version.root_secrets.secret_string)["docker_registry"]
docker_user = jsondecode(data.aws_secretsmanager_secret_version.root_secrets.secret_string)["docker_user"]
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/k8s.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/k8s.tf
index 2a4ff76333ac..dfe366e06166 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/k8s.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/k8s.tf
@@ -25,7 +25,7 @@ resource "kubernetes_namespace" "monitoring" {
# external dns maps route53 to ingress resources
resource "helm_release" "external_dns" {
- name = "external-dns"
+ name = var.external_dns_deployment_name
repository = local.stable_helm_repo
chart = "external-dns"
version = "2.19.1"
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/logging.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/logging.tf
index c38b3e4a407d..bbb8f09ca336 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/logging.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/logging.tf
@@ -18,7 +18,7 @@ locals {
resource "helm_release" "fluentd" {
count = var.elasticsearch_endpoint == null ? 0 : 1
- name = "fluentd"
+ name = var.fluentd_deployment_name
namespace = kubernetes_namespace.orc8r.metadata[0].name
repository = local.stable_helm_repo
chart = "fluentd"
@@ -130,7 +130,7 @@ resource "helm_release" "fluentd" {
resource "helm_release" "elasticsearch_curator" {
count = var.elasticsearch_endpoint == null ? 0 : 1
- name = "elasticsearch-curator"
+ name = var.elasticsearch_curator_name
repository = local.stable_helm_repo
chart = "elasticsearch-curator"
namespace = kubernetes_namespace.monitoring.metadata[0].name
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/main.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/main.tf
index 201679b93a1a..20470e35940b 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/main.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/main.tf
@@ -40,11 +40,6 @@ resource "helm_release" "orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
resource "helm_release" "lte-orc8r" {
@@ -69,11 +64,6 @@ resource "helm_release" "lte-orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
resource "helm_release" "feg-orc8r" {
@@ -97,11 +87,6 @@ resource "helm_release" "feg-orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
resource "helm_release" "cwf-orc8r" {
@@ -121,11 +106,6 @@ resource "helm_release" "cwf-orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
@@ -147,11 +127,6 @@ resource "helm_release" "fbinternal-orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
resource "helm_release" "wifi-orc8r" {
@@ -172,11 +147,6 @@ resource "helm_release" "wifi-orc8r" {
name = "controller.spec.database.pass"
value = var.orc8r_db_pass
}
-
- set_sensitive {
- name = "nms.magmalte.env.mysql_pass"
- value = var.nms_db_pass
- }
}
@@ -203,15 +173,14 @@ data "template_file" "orc8r_values" {
api_hostname = format("api.%s", var.orc8r_domain_name)
nms_hostname = format("*.nms.%s", var.orc8r_domain_name)
- orc8r_db_name = var.orc8r_db_name
- orc8r_db_host = var.orc8r_db_host
- orc8r_db_port = var.orc8r_db_port
- orc8r_db_user = var.orc8r_db_user
+ orc8r_db_name = var.orc8r_db_name
+ orc8r_db_host = var.orc8r_db_host
+ orc8r_db_port = var.orc8r_db_port
+ orc8r_db_dialect = var.orc8r_db_dialect
+ orc8r_db_user = var.orc8r_db_user
+ orc8r_db_pass = var.orc8r_db_pass
deploy_nms = var.deploy_nms
- nms_db_name = var.nms_db_name
- nms_db_host = var.nms_db_host
- nms_db_user = var.nms_db_user
metrics_pvc_promcfg = kubernetes_persistent_volume_claim.storage["promcfg"].metadata.0.name
metrics_pvc_promdata = kubernetes_persistent_volume_claim.storage["promdata"].metadata.0.name
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/storage.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/storage.tf
index 44be3da08907..c45b33c4b237 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/storage.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/storage.tf
@@ -55,7 +55,7 @@ resource "kubernetes_persistent_volume_claim" "storage" {
storage = each.value.storage
}
}
- storage_class_name = "efs"
+ storage_class_name = var.efs_storage_class_name
}
depends_on = [helm_release.efs_provisioner]
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/templates/orc8r-values.tpl b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/templates/orc8r-values.tpl
index 1ec4d8439b9c..505cf89af8e9 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/templates/orc8r-values.tpl
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/templates/orc8r-values.tpl
@@ -183,9 +183,12 @@ nms:
env:
api_host: ${api_hostname}
- mysql_db: ${nms_db_name}
- mysql_host: ${nms_db_host}
- mysql_user: ${nms_db_user}
+ mysql_db: ${orc8r_db_name}
+ mysql_dialect: ${orc8r_db_dialect}
+ mysql_host: ${orc8r_db_host}
+ mysql_port: ${orc8r_db_port}
+ mysql_user: ${orc8r_db_user}
+ mysql_pass: ${orc8r_db_pass}
grafana_address: ${user_grafana_hostname}
nginx:
diff --git a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/variables.tf b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/variables.tf
index c490b49ca40f..8fbd71d73a32 100644
--- a/orc8r/cloud/deploy/terraform/orc8r-helm-aws/variables.tf
+++ b/orc8r/cloud/deploy/terraform/orc8r-helm-aws/variables.tf
@@ -43,6 +43,12 @@ variable "orc8r_route53_zone_id" {
type = string
}
+variable "external_dns_deployment_name" {
+ description = "Name of the external dns helm deployment"
+ type = string
+ default = "external-dns"
+}
+
variable "external_dns_role_arn" {
description = "IAM role ARN for ExternalDNS."
type = string
@@ -96,6 +102,11 @@ variable "orc8r_db_name" {
type = string
}
+variable "orc8r_db_dialect" {
+ description = "DB dialect for Orchestrator database connection."
+ type = string
+}
+
variable "orc8r_db_host" {
description = "DB hostname for Orchestrator database connection."
type = string
@@ -112,21 +123,6 @@ variable "orc8r_db_user" {
type = string
}
-variable "nms_db_name" {
- description = "DB name for NMS database connection."
- type = string
-}
-
-variable "nms_db_host" {
- description = "DB hostname for NMS database connection."
- type = string
-}
-
-variable "nms_db_user" {
- description = "DB username for NMS database connection."
- type = string
-}
-
##############################################################################
# Helm configuration
##############################################################################
@@ -171,7 +167,7 @@ variable "orc8r_deployment_type" {
variable "orc8r_chart_version" {
description = "Version of the core orchestrator Helm chart to install."
type = string
- default = "1.5.18"
+ default = "1.5.19"
}
variable "cwf_orc8r_chart_version" {
@@ -224,6 +220,18 @@ variable "efs_provisioner_role_arn" {
type = string
}
+variable "efs_provisioner_name" {
+ description = "Name of the efs provisioner helm deployment"
+ type = string
+ default = "efs-provisioner"
+}
+
+variable "efs_storage_class_name" {
+ description = "Name of the Storage class"
+ type = string
+ default = "efs"
+}
+
##############################################################################
# Log aggregation configuration
##############################################################################
@@ -258,6 +266,18 @@ variable "elasticsearch_curator_log_level" {
default = "INFO"
}
+variable "elasticsearch_curator_name" {
+ description = "Name of the elasticsearch-curator helm deployment"
+ type = string
+ default = "elasticsearch-curator"
+}
+
+variable "fluentd_deployment_name" {
+ description = "Name of the fluentd helm deployment"
+ type = string
+ default = "fluentd"
+}
+
##############################################################################
# Secret configuration and values
##############################################################################
@@ -272,11 +292,6 @@ variable "orc8r_db_pass" {
type = string
}
-variable "nms_db_pass" {
- description = "NMS DB password."
- type = string
-}
-
variable "docker_registry" {
description = "Docker registry to pull Orchestrator containers from."
type = string
diff --git a/orc8r/cloud/docker/controller/supervisord.conf b/orc8r/cloud/docker/controller/supervisord.conf
index c9e9fbda3c59..f22bf3bd4320 100644
--- a/orc8r/cloud/docker/controller/supervisord.conf
+++ b/orc8r/cloud/docker/controller/supervisord.conf
@@ -269,3 +269,11 @@ stdout_logfile=NONE
stderr_logfile=NONE
stdout_events_enabled=true
stderr_events_enabled=true
+
+[program:nprobe]
+command=/usr/bin/envdir /var/opt/magma/envdir /var/opt/magma/bin/nprobe -run_echo_server=true -logtostderr=true -v=0
+autorestart=true
+stdout_logfile=NONE
+stderr_logfile=NONE
+stdout_events_enabled=true
+stderr_events_enabled=true
diff --git a/orc8r/cloud/docker/nginx/templates/nginx.conf.j2 b/orc8r/cloud/docker/nginx/templates/nginx.conf.j2
index 34c03858bfbc..1e0f90afba1b 100644
--- a/orc8r/cloud/docker/nginx/templates/nginx.conf.j2
+++ b/orc8r/cloud/docker/nginx/templates/nginx.conf.j2
@@ -133,7 +133,7 @@ http {
if ($srv ~* "(\w+)[_](\w+)") {
set $srv "$1-$2";
}
- grpc_pass grpc://orc8r-$srv.{{ backend }}:9180;
+ grpc_pass grpc://orc8r-bootstrapper.{{ backend }}:9180;
{%- else %}
grpc_pass grpc://{{ backend }}:$open_srvport;
{%- endif %}
diff --git a/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml b/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml
index a1368c7a713f..8287d991e4fd 100644
--- a/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml
+++ b/orc8r/cloud/go/obsidian/swagger/v1/swagger.yml
@@ -3203,6 +3203,156 @@ paths:
summary: Update the name of an LTE network
tags:
- LTE Networks
+ /lte/{network_id}/network_probe/destinations:
+ get:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ responses:
+ "200":
+ description: Provisioned NetworkProbe Destinations
+ schema:
+ $ref: '#/definitions/network_probe_destination'
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: List NetworkProbe Destinations in the network
+ tags:
+ - Network Probes
+ post:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - in: body
+ name: network_probe_destination
+ required: true
+ schema:
+ $ref: '#/definitions/network_probe_destination'
+ responses:
+ "201":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Add a new NetworkProbeDestination to the network
+ tags:
+ - Network Probes
+ /lte/{network_id}/network_probe/destinations/{destination_id}:
+ delete:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/destination_id'
+ responses:
+ "204":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Remove a NetworkProbe Destination from the network
+ tags:
+ - Network Probes
+ get:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/destination_id'
+ responses:
+ "200":
+ description: NetworkProbeDestination Info
+ schema:
+ $ref: '#/definitions/network_probe_destination'
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Retrieve a NetworkProbe Destination
+ tags:
+ - Network Probes
+ put:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/destination_id'
+ - description: New NetworkProbeDestination configuration
+ in: body
+ name: network_probe_destination
+ required: true
+ schema:
+ $ref: '#/definitions/network_probe_destination'
+ responses:
+ "204":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Update an existing NetworkProbe Destination in the network
+ tags:
+ - Network Probes
+ /lte/{network_id}/network_probe/tasks:
+ get:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ responses:
+ "200":
+ description: Provisioned NetworkProbeTasks
+ schema:
+ $ref: '#/definitions/network_probe_task'
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: List NetworkProbeTask in the network
+ tags:
+ - Network Probes
+ post:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - in: body
+ name: network_probe_task
+ required: true
+ schema:
+ $ref: '#/definitions/network_probe_task'
+ responses:
+ "201":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Add a new NetworkProbeTask to the network
+ tags:
+ - Network Probes
+ /lte/{network_id}/network_probe/tasks/{task_id}:
+ delete:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/task_id'
+ responses:
+ "204":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Remove an NetworkProbeTask from the network
+ tags:
+ - Network Probes
+ get:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/task_id'
+ responses:
+ "200":
+ description: NetworkProbeTask Info
+ schema:
+ $ref: '#/definitions/network_probe_task'
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Retrieve the NetworkProbeTask info
+ tags:
+ - Network Probes
+ put:
+ parameters:
+ - $ref: '#/parameters/network_id'
+ - $ref: '#/parameters/task_id'
+ - description: New NetworkProbeTask configuration
+ in: body
+ name: network_probe_task
+ required: true
+ schema:
+ $ref: '#/definitions/network_probe_task'
+ responses:
+ "204":
+ description: Success
+ default:
+ $ref: '#/responses/UnexpectedError'
+ summary: Update an existing NetworkProbeTask in the network
+ tags:
+ - Network Probes
/lte/{network_id}/policy_qos_profiles:
get:
parameters:
@@ -6543,6 +6693,12 @@ parameters:
name: channel_id
required: true
type: string
+ destination_id:
+ description: Network Probe Destination ID
+ in: path
+ name: destination_id
+ required: true
+ type: string
dns_domain:
description: DNS record domain
in: path
@@ -6657,6 +6813,12 @@ parameters:
name: subscriber_id
required: true
type: string
+ task_id:
+ description: Network Probe Task ID
+ in: path
+ name: task_id
+ required: true
+ type: string
tenant_id:
description: Tenant ID
in: path
@@ -9928,6 +10090,93 @@ definitions:
minLength: 1
type: string
x-nullable: false
+ network_probe_destination:
+ description: Network Probe Destination
+ properties:
+ destination_details:
+ $ref: '#/definitions/network_probe_destination_details'
+ destination_id:
+ $ref: '#/definitions/network_probe_destination_id'
+ required:
+ - destination_id
+ - destination_details
+ type: object
+ network_probe_destination_details:
+ properties:
+ delivery_address:
+ example: 127.0.0.1:4040
+ type: string
+ x-nullable: false
+ delivery_type:
+ enum:
+ - all
+ - events_only
+ example: events_only
+ type: string
+ x-nullable: false
+ required:
+ - delivery_type
+ - delivery_address
+ type: object
+ network_probe_destination_id:
+ example: xxxx-yyyy-zzzz
+ type: string
+ x-nullable: false
+ network_probe_task:
+ description: Network Probe Task
+ properties:
+ task_details:
+ $ref: '#/definitions/network_probe_task_details'
+ task_id:
+ $ref: '#/definitions/network_probe_task_id'
+ required:
+ - task_id
+ - task_details
+ type: object
+ network_probe_task_details:
+ properties:
+ correlation_id:
+ example: 605394647632969700
+ format: uint64
+ type: integer
+ delivery_type:
+ enum:
+ - all
+ - events_only
+ example: events_only
+ type: string
+ x-nullable: false
+ duration:
+ default: 0
+ description: the duration in seconds after which the task will expire.
+ example: 300
+ minimum: 0
+ type: integer
+ target_id:
+ type: string
+ x-nullable: false
+ target_type:
+ enum:
+ - imsi
+ - imei
+ - msisdn
+ example: imsi
+ type: string
+ x-nullable: false
+ timestamp:
+ description: The timestamp in ISO 8601 format
+ example: "2020-03-11T00:36:59.65Z"
+ format: date-time
+ type: string
+ required:
+ - target_id
+ - target_type
+ - delivery_type
+ type: object
+ network_probe_task_id:
+ example: imsi1023001
+ type: string
+ x-nullable: false
network_ran_configs:
description: RAN (radio access network) cellular configuration for a network
minLength: 1
diff --git a/orc8r/cloud/go/services/ctraced/ctraced/main.go b/orc8r/cloud/go/services/ctraced/ctraced/main.go
index 38c55418f8d7..f0f912d92ffc 100644
--- a/orc8r/cloud/go/services/ctraced/ctraced/main.go
+++ b/orc8r/cloud/go/services/ctraced/ctraced/main.go
@@ -22,9 +22,11 @@ import (
"magma/orc8r/cloud/go/service"
"magma/orc8r/cloud/go/services/ctraced"
"magma/orc8r/cloud/go/services/ctraced/obsidian/handlers"
+ "magma/orc8r/cloud/go/services/ctraced/servicers"
ctraced_storage "magma/orc8r/cloud/go/services/ctraced/storage"
"magma/orc8r/cloud/go/sqorc"
"magma/orc8r/cloud/go/storage"
+ "magma/orc8r/lib/go/protos"
"github.com/golang/glog"
)
@@ -33,29 +35,31 @@ func main() {
// Create service
srv, err := service.NewOrchestratorService(orc8r.ModuleName, ctraced.ServiceName)
if err != nil {
- glog.Fatalf("Error creating ctraced service: %s", err)
+ glog.Fatalf("Error creating ctraced service: %+v", err)
}
- swagger_protos.RegisterSwaggerSpecServer(srv.GrpcServer, swagger.NewSpecServicerFromFile(ctraced.ServiceName))
-
// Init storage
db, err := sqorc.Open(storage.SQLDriver, storage.DatabaseSource)
if err != nil {
- glog.Fatalf("Error opening db connection: %v", err)
+ glog.Fatalf("Error opening db connection: %+v", err)
}
fact := blobstore.NewSQLBlobStorageFactory(ctraced.LookupTableBlobstore, db, sqorc.GetSqlBuilder())
err = fact.InitializeFactory()
if err != nil {
- glog.Fatalf("Error initializing ctraced table: %v", err)
+ glog.Fatalf("Error initializing ctraced table: %+v", err)
}
ctracedBlobstore := ctraced_storage.NewCtracedBlobstore(fact)
+ // Init gRPC servicer
+ protos.RegisterCallTraceControllerServer(srv.GrpcServer, servicers.NewCallTraceServicer(ctracedBlobstore))
+ swagger_protos.RegisterSwaggerSpecServer(srv.GrpcServer, swagger.NewSpecServicerFromFile(ctraced.ServiceName))
+
gwClient := handlers.NewGwCtracedClient()
obsidian.AttachHandlers(srv.EchoServer, handlers.GetObsidianHandlers(gwClient, ctracedBlobstore))
// Run service
err = srv.Run()
if err != nil {
- glog.Fatalf("Error running ctraced service: %s", err)
+ glog.Fatalf("Error running ctraced service: %+v", err)
}
}
diff --git a/orc8r/cloud/go/services/ctraced/obsidian/handlers/handlers.go b/orc8r/cloud/go/services/ctraced/obsidian/handlers/handlers.go
index c4a93e2c4268..c92df2df5bcf 100644
--- a/orc8r/cloud/go/services/ctraced/obsidian/handlers/handlers.go
+++ b/orc8r/cloud/go/services/ctraced/obsidian/handlers/handlers.go
@@ -158,7 +158,9 @@ func getUpdateCallTraceHandlerFunc(client GwCtracedClient, storage storage.Ctrac
return obsidian.HttpError(errors.New("Error: call trace end already triggered earlier"), http.StatusBadRequest)
}
- req := &protos.EndTraceRequest{}
+ req := &protos.EndTraceRequest{
+ TraceId: callTraceID,
+ }
resp, err := client.EndCallTrace(networkID, callTrace.Config.GatewayID, req)
if err != nil {
return err
@@ -256,7 +258,9 @@ func getNetworkIDAndCallTraceID(c echo.Context) (string, string, *echo.HTTPError
func buildStartTraceRequest(cfg *models.CallTraceConfig) (*protos.StartTraceRequest, error) {
req := &protos.StartTraceRequest{
+ TraceId: cfg.TraceID,
TraceType: protos.StartTraceRequest_ALL,
+ Timeout: cfg.Timeout,
CaptureFilters: cfg.CaptureFilters,
DisplayFilters: cfg.DisplayFilters,
}
diff --git a/orc8r/cloud/go/services/ctraced/servicers/trace_servicer.go b/orc8r/cloud/go/services/ctraced/servicers/trace_servicer.go
new file mode 100644
index 000000000000..75f2895b0a1b
--- /dev/null
+++ b/orc8r/cloud/go/services/ctraced/servicers/trace_servicer.go
@@ -0,0 +1,97 @@
+/*
+Copyright 2020 The Magma Authors.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package servicers
+
+import (
+ "context"
+ "fmt"
+
+ "magma/orc8r/cloud/go/orc8r"
+ "magma/orc8r/cloud/go/serdes"
+ "magma/orc8r/cloud/go/services/configurator"
+ "magma/orc8r/cloud/go/services/ctraced/obsidian/models"
+ "magma/orc8r/cloud/go/services/ctraced/storage"
+ merrors "magma/orc8r/lib/go/errors"
+ "magma/orc8r/lib/go/protos"
+
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
+)
+
+type callTraceServicer struct {
+ storage storage.CtracedStorage
+}
+
+func NewCallTraceServicer(storage storage.CtracedStorage) protos.CallTraceControllerServer {
+ return &callTraceServicer{storage: storage}
+}
+
+func (srv *callTraceServicer) ReportEndedCallTrace(ctx context.Context, req *protos.ReportEndedTraceRequest) (*protos.ReportEndedTraceResponse, error) {
+ networkID, err := getNetworkID(ctx)
+ if err != nil {
+ return nil, err
+ }
+ callTrace, err := getCallTraceModel(networkID, req.TraceId)
+ if err != nil {
+ return nil, err
+ }
+
+ err = srv.storage.StoreCallTrace(networkID, req.TraceId, req.TraceContent)
+ if err != nil {
+ return nil, status.Errorf(codes.Aborted, fmt.Sprintf("failed to save call trace data, network-id: %s, gateway-id: %s, calltrace-id: %s", networkID, callTrace.Config.GatewayID, req.TraceId))
+ }
+
+ callTrace.State.CallTraceEnding = req.Success
+ callTrace.State.CallTraceAvailable = req.Success
+
+ update := configurator.EntityUpdateCriteria{
+ Type: orc8r.CallTraceEntityType,
+ Key: req.TraceId,
+ NewConfig: callTrace,
+ }
+
+ _, err = configurator.UpdateEntity(networkID, update, serdes.Entity)
+ if err != nil {
+ return nil, status.Errorf(codes.Aborted, fmt.Sprintf("failed to update call trace, network-id: %s, gateway-id: %s, calltrace-id: %s", networkID, callTrace.Config.GatewayID, req.TraceId))
+ }
+ return &protos.ReportEndedTraceResponse{}, nil
+}
+
+func getNetworkID(ctx context.Context) (string, error) {
+ id, err := protos.GetGatewayIdentity(ctx)
+ if err != nil {
+ return "", err
+ }
+ return id.GetNetworkId(), nil
+}
+
+func getCallTraceModel(networkID string, callTraceID string) (*models.CallTrace, error) {
+ ent, err := configurator.LoadEntity(
+ networkID, orc8r.CallTraceEntityType, callTraceID,
+ configurator.EntityLoadCriteria{LoadConfig: true},
+ serdes.Entity,
+ )
+ if err == merrors.ErrNotFound {
+ return nil, status.Errorf(codes.InvalidArgument, "Call trace not found")
+ }
+ if err != nil {
+ return nil, status.Errorf(codes.InvalidArgument, "Failed to load call trace")
+ }
+ callTrace := &models.CallTrace{}
+ err = callTrace.FromBackendModels(ent)
+ if err != nil {
+ return nil, status.Errorf(codes.Aborted, "Failed to load call trace")
+ }
+ return callTrace, nil
+}
diff --git a/orc8r/cloud/go/services/ctraced/servicers/trace_servicer_test.go b/orc8r/cloud/go/services/ctraced/servicers/trace_servicer_test.go
new file mode 100644
index 000000000000..ecd8fc8203df
--- /dev/null
+++ b/orc8r/cloud/go/services/ctraced/servicers/trace_servicer_test.go
@@ -0,0 +1,101 @@
+/*
+Copyright 2020 The Magma Authors.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package servicers_test
+
+import (
+ "testing"
+
+ "magma/orc8r/cloud/go/orc8r"
+ "magma/orc8r/cloud/go/serdes"
+ "magma/orc8r/cloud/go/services/configurator"
+ "magma/orc8r/cloud/go/services/configurator/test_init"
+ models "magma/orc8r/cloud/go/services/ctraced/obsidian/models"
+ "magma/orc8r/cloud/go/services/ctraced/servicers"
+ "magma/orc8r/cloud/go/services/ctraced/storage"
+ deviceTestInit "magma/orc8r/cloud/go/services/device/test_init"
+ "magma/orc8r/cloud/go/test_utils"
+ "magma/orc8r/lib/go/protos"
+
+ "github.com/stretchr/testify/assert"
+ "golang.org/x/net/context"
+)
+
+func TestCallTraceServicer(t *testing.T) {
+ test_init.StartTestService(t)
+ deviceTestInit.StartTestService(t)
+
+ testNetworkId := "n1"
+ testGwHwId := "hw1"
+ testGwLogicalId := "g1"
+
+ // Initialize network
+ err := configurator.CreateNetwork(configurator.Network{ID: testNetworkId}, serdes.Network)
+ assert.NoError(t, err)
+
+ // Create a call trace
+ testTraceCfg := &models.CallTraceConfig{
+ TraceID: "CallTrace1",
+ GatewayID: "test_gateway_id",
+ Timeout: 300,
+ TraceType: models.CallTraceConfigTraceTypeGATEWAY,
+ }
+ testTrace := &models.CallTrace{
+ Config: testTraceCfg,
+ State: &models.CallTraceState{
+ CallTraceAvailable: false,
+ CallTraceEnding: false,
+ },
+ }
+ _, err = configurator.CreateEntity(
+ testNetworkId,
+ configurator.NetworkEntity{
+ Type: orc8r.CallTraceEntityType,
+ Key: "CallTrace1",
+ Config: testTrace,
+ },
+ serdes.Entity,
+ )
+ assert.NoError(t, err)
+
+ // Create an identity and context for sending requests as gateway
+ id := protos.Identity{}
+ idgw := protos.Identity_Gateway{HardwareId: testGwHwId, NetworkId: testNetworkId, LogicalId: testGwLogicalId}
+ id.SetGateway(&idgw)
+ ctx := id.NewContextWithIdentity(context.Background())
+
+ fact := test_utils.NewSQLBlobstore(t, "ctraced_trace_servicer_test_blobstore")
+ blobstore := storage.NewCtracedBlobstore(fact)
+ srv := servicers.NewCallTraceServicer(blobstore)
+
+ // Missing subscriber ID
+ req := &protos.ReportEndedTraceRequest{TraceId: "CallTrace0", Success: true, TraceContent: []byte("abcdefghijklmnopqrstuvwxyz\n")}
+ _, err = srv.ReportEndedCallTrace(ctx, req)
+ assert.EqualError(t, err, "rpc error: code = InvalidArgument desc = Call trace not found")
+
+ // Successfully ending the call trace
+ req = &protos.ReportEndedTraceRequest{TraceId: "CallTrace1", Success: true, TraceContent: []byte("abcdefghijklmnopqrstuvwxyz\n")}
+ _, err = srv.ReportEndedCallTrace(ctx, req)
+ assert.NoError(t, err)
+
+ // Verify that the call trace has ended
+ ent, err := configurator.LoadEntity(
+ testNetworkId, orc8r.CallTraceEntityType, "CallTrace1",
+ configurator.FullEntityLoadCriteria(),
+ serdes.Entity,
+ )
+ testCallTrace := (&models.CallTrace{}).FromEntity(ent)
+ assert.NoError(t, err)
+ assert.Equal(t, true, testCallTrace.State.CallTraceAvailable)
+ assert.Equal(t, true, testCallTrace.State.CallTraceEnding)
+}
diff --git a/orc8r/cloud/helm/orc8r/Chart.lock b/orc8r/cloud/helm/orc8r/Chart.lock
index 018265b2192d..42c3e04893e3 100644
--- a/orc8r/cloud/helm/orc8r/Chart.lock
+++ b/orc8r/cloud/helm/orc8r/Chart.lock
@@ -7,12 +7,12 @@ dependencies:
version: 1.4.22
- name: nms
repository: ""
- version: 0.1.10
+ version: 0.1.11
- name: logging
repository: ""
version: 0.1.10
- name: orc8rlib
repository: file://../orc8rlib
version: 0.1.2
-digest: sha256:7a49d5fba17dce594a8a6c4c89a7204678acca652c4b4d4727fc07f00132117d
-generated: "2021-03-05T11:56:20.589138693+05:30"
+digest: sha256:73383945a6f49b14bad2d42ffc0223286cd1d3f106319efc3739dc494547f08c
+generated: "2021-04-06T16:10:45.754709-07:00"
diff --git a/orc8r/cloud/helm/orc8r/Chart.yaml b/orc8r/cloud/helm/orc8r/Chart.yaml
index a30ece0e89f8..be1290677d9c 100644
--- a/orc8r/cloud/helm/orc8r/Chart.yaml
+++ b/orc8r/cloud/helm/orc8r/Chart.yaml
@@ -13,7 +13,7 @@ apiVersion: v2
appVersion: "1.0"
description: A Helm chart for magma orchestrator
name: orc8r
-version: 1.5.18
+version: 1.5.19
engine: gotpl
sources:
- https://github.com/magma/magma
@@ -31,7 +31,7 @@ dependencies:
repository: ""
condition: metrics.enabled
- name: nms
- version: 0.1.10
+ version: 0.1.11
repository: ""
condition: nms.enabled
- name: logging
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/Chart.yaml b/orc8r/cloud/helm/orc8r/charts/nms/Chart.yaml
index f662ad3c29b0..4cfcf3296285 100644
--- a/orc8r/cloud/helm/orc8r/charts/nms/Chart.yaml
+++ b/orc8r/cloud/helm/orc8r/charts/nms/Chart.yaml
@@ -12,7 +12,7 @@
apiVersion: v1
description: Magma NMS
name: nms
-version: 0.1.10
+version: 0.1.11
home: https://github.com/magma/magma
sources:
- https://github.com/magma/magma
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/templates/magmalte-deployment.yaml b/orc8r/cloud/helm/orc8r/charts/nms/templates/magmalte-deployment.yaml
index 3257b40755c2..47df3e6d6b26 100644
--- a/orc8r/cloud/helm/orc8r/charts/nms/templates/magmalte-deployment.yaml
+++ b/orc8r/cloud/helm/orc8r/charts/nms/templates/magmalte-deployment.yaml
@@ -80,6 +80,8 @@ spec:
value: {{ .Values.magmalte.env.mysql_db | quote }}
- name: MYSQL_HOST
value: {{ .Values.magmalte.env.mysql_host | quote }}
+ - name: MYSQL_PORT
+ value: {{ .Values.magmalte.env.mysql_port | quote }}
- name: MYSQL_DIALECT
value: {{ .Values.magmalte.env.mysql_dialect | quote }}
- name: MYSQL_PASS
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/values.yaml b/orc8r/cloud/helm/orc8r/charts/nms/values.yaml
index ed1c888cad33..18cbe25308ea 100644
--- a/orc8r/cloud/helm/orc8r/charts/nms/values.yaml
+++ b/orc8r/cloud/helm/orc8r/charts/nms/values.yaml
@@ -30,10 +30,11 @@ magmalte:
port: 8081
mapbox_access_token: ""
mysql_host: mariadb.magma.svc.cluster.local
+ mysql_port: 5432
mysql_db: magma
mysql_user: magma
mysql_pass: password
- mysql_dialect: mysql
+ mysql_dialect: postgres
grafana_address: orc8r-user-grafana:3000
labels: {}
diff --git a/orc8r/gateway/c/common/async_grpc/GRPCReceiver.cpp b/orc8r/gateway/c/common/async_grpc/GRPCReceiver.cpp
index 5bf897a3d03a..ede96a227f13 100644
--- a/orc8r/gateway/c/common/async_grpc/GRPCReceiver.cpp
+++ b/orc8r/gateway/c/common/async_grpc/GRPCReceiver.cpp
@@ -10,8 +10,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include "GRPCReceiver.h"
-#include "magma_logging.h"
+#include // for operator<<, char_traits
+#include "magma_logging.h" // for MLOG
namespace magma {
diff --git a/orc8r/gateway/c/common/async_grpc/GRPCReceiver.h b/orc8r/gateway/c/common/async_grpc/GRPCReceiver.h
index 9c6c151790b1..7047309c9f15 100644
--- a/orc8r/gateway/c/common/async_grpc/GRPCReceiver.h
+++ b/orc8r/gateway/c/common/async_grpc/GRPCReceiver.h
@@ -12,9 +12,18 @@
*/
#pragma once
-#include
-#include
-#include
+#include // for ClientContext
+#include // for CompletionQueue
+#include // for Status
+#include // for uint32_t
+#include // for atomic
+#include // for operator+, seconds
+#include // for function
+#include // for unique_ptr
+namespace grpc {
+template
+class ClientAsyncResponseReader;
+}
namespace magma {
diff --git a/orc8r/gateway/c/common/config/MConfigLoader.cpp b/orc8r/gateway/c/common/config/MConfigLoader.cpp
index 60eca8937517..50d18680ab4c 100644
--- a/orc8r/gateway/c/common/config/MConfigLoader.cpp
+++ b/orc8r/gateway/c/common/config/MConfigLoader.cpp
@@ -11,15 +11,18 @@
* limitations under the License.
*/
-#include
-#include
-#include
-#include // JSON library
-#include
-#include
-
#include "MConfigLoader.h"
-#include "magma_logging.h"
+#include // for Status
+#include // for JsonStringToMessage
+#include // for getenv
+#include // for operator<<, char_traits
+#include // for basic_json<>::iterator
+#include "magma_logging.h" // for MLOG
+namespace google {
+namespace protobuf {
+class Message;
+}
+} // namespace google
using json = nlohmann::json;
diff --git a/orc8r/gateway/c/common/config/MConfigLoader.h b/orc8r/gateway/c/common/config/MConfigLoader.h
index c1c915ce1123..de24f7b56b4a 100644
--- a/orc8r/gateway/c/common/config/MConfigLoader.h
+++ b/orc8r/gateway/c/common/config/MConfigLoader.h
@@ -12,7 +12,13 @@
*/
#pragma once
-#include
+#include // for ifstream
+#include // for string
+namespace google {
+namespace protobuf {
+class Message;
+}
+} // namespace google
namespace magma {
diff --git a/orc8r/gateway/c/common/config/ServiceConfigLoader.cpp b/orc8r/gateway/c/common/config/ServiceConfigLoader.cpp
index 16e46f9387e8..9895cd2c02cb 100644
--- a/orc8r/gateway/c/common/config/ServiceConfigLoader.cpp
+++ b/orc8r/gateway/c/common/config/ServiceConfigLoader.cpp
@@ -11,12 +11,14 @@
* limitations under the License.
*/
-#include
-#include
-
#include "ServiceConfigLoader.h"
-#include "YAMLUtils.h"
-#include "magma_logging.h"
+#include // for BadFile
+#include // for Node::Node, Node::~Node
+#include // for LoadFile
+#include // for operator<<, basic_ostream
+#include // for allocator, operator+, char_traits
+#include "YAMLUtils.h" // for YAMLUtils
+#include "magma_logging.h" // for MLOG
namespace magma {
diff --git a/orc8r/gateway/c/common/config/ServiceConfigLoader.h b/orc8r/gateway/c/common/config/ServiceConfigLoader.h
index b7685a69e416..844eb0ed8a02 100644
--- a/orc8r/gateway/c/common/config/ServiceConfigLoader.h
+++ b/orc8r/gateway/c/common/config/ServiceConfigLoader.h
@@ -12,8 +12,8 @@
*/
#pragma once
-#include
-#include "yaml-cpp/yaml.h"
+#include // for Node
+#include // for string
namespace magma {
diff --git a/orc8r/gateway/c/common/config/YAMLUtils.cpp b/orc8r/gateway/c/common/config/YAMLUtils.cpp
index d4320c0509a1..adef4fcfc5e0 100644
--- a/orc8r/gateway/c/common/config/YAMLUtils.cpp
+++ b/orc8r/gateway/c/common/config/YAMLUtils.cpp
@@ -11,10 +11,10 @@
* limitations under the License.
*/
-#include
-
#include "YAMLUtils.h"
-#include "magma_logging.h"
+#include // IWYU pragma: keep
+#include // for operator!=, iterator_f...
+#include // for string
namespace magma {
diff --git a/orc8r/gateway/c/common/config/YAMLUtils.h b/orc8r/gateway/c/common/config/YAMLUtils.h
index 0d0b429edbf2..f29d5d70f9da 100644
--- a/orc8r/gateway/c/common/config/YAMLUtils.h
+++ b/orc8r/gateway/c/common/config/YAMLUtils.h
@@ -12,8 +12,7 @@
*/
#pragma once
-#include
-#include "yaml-cpp/yaml.h"
+#include // for Node
namespace magma {
diff --git a/orc8r/gateway/c/common/datastore/Serializers.cpp b/orc8r/gateway/c/common/datastore/Serializers.cpp
index 09c3a840e01c..88e636c54c61 100644
--- a/orc8r/gateway/c/common/datastore/Serializers.cpp
+++ b/orc8r/gateway/c/common/datastore/Serializers.cpp
@@ -10,8 +10,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include "Serializers.h"
-#include
+#include // for Message
+#include // for RedisState
using google::protobuf::Message;
using magma::orc8r::RedisState;
diff --git a/orc8r/gateway/c/common/datastore/Serializers.h b/orc8r/gateway/c/common/datastore/Serializers.h
index 41d5b6bb5149..8c7917840d70 100644
--- a/orc8r/gateway/c/common/datastore/Serializers.h
+++ b/orc8r/gateway/c/common/datastore/Serializers.h
@@ -12,8 +12,14 @@
*/
#pragma once
-#include
-#include
+#include // for uint64_t
+#include // for function
+#include // for string
+namespace google {
+namespace protobuf {
+class Message;
+}
+} // namespace google
using google::protobuf::Message;
namespace magma {
diff --git a/orc8r/gateway/c/common/eventd/EventdClient.cpp b/orc8r/gateway/c/common/eventd/EventdClient.cpp
index be15cbfbfd13..6d278c4adb56 100644
--- a/orc8r/gateway/c/common/eventd/EventdClient.cpp
+++ b/orc8r/gateway/c/common/eventd/EventdClient.cpp
@@ -11,17 +11,30 @@
* limitations under the License.
*/
#include "EventdClient.h"
-
-#include "ServiceRegistrySingleton.h"
-
-using grpc::ClientContext;
-using grpc::Status;
-using magma::orc8r::Event;
-using magma::orc8r::EventService;
-using magma::orc8r::Void;
+#include // for Channel
+#include // for default_delete
+#include // for move
+#include "ServiceRegistrySingleton.h" // for ServiceRegistrySin...
+#include "orc8r/protos/common.pb.h" // for Void
+#include "orc8r/protos/eventd.grpc.pb.h" // for EventService::Stub
+namespace grpc {
+class ClientContext;
+}
+namespace grpc {
+class Status;
+}
+namespace magma {
+namespace orc8r {
+class Event;
+}
+} // namespace magma
namespace magma {
+using orc8r::Event;
+using orc8r::EventService;
+using orc8r::Void;
+
AsyncEventdClient& AsyncEventdClient::getInstance() {
static AsyncEventdClient instance;
return instance;
diff --git a/orc8r/gateway/c/common/eventd/EventdClient.h b/orc8r/gateway/c/common/eventd/EventdClient.h
index 0fb36ed76ae1..274fcdd4c535 100644
--- a/orc8r/gateway/c/common/eventd/EventdClient.h
+++ b/orc8r/gateway/c/common/eventd/EventdClient.h
@@ -12,13 +12,24 @@
*/
#pragma once
-#include
-#include
-
-#include
-#include
-
-#include "GRPCReceiver.h"
+#include // for EventService::Stub, EventSe...
+#include // for uint32_t
+#include // for function
+#include // for unique_ptr
+#include "GRPCReceiver.h" // for GRPCReceiver
+namespace grpc {
+class Status;
+}
+namespace magma {
+namespace orc8r {
+class Event;
+}
+} // namespace magma
+namespace magma {
+namespace orc8r {
+class Void;
+}
+} // namespace magma
using grpc::Status;
diff --git a/orc8r/gateway/c/common/policydb/PolicyLoader.cpp b/orc8r/gateway/c/common/policydb/PolicyLoader.cpp
index d2f78f6c5c5f..3f6a8321aaa7 100644
--- a/orc8r/gateway/c/common/policydb/PolicyLoader.cpp
+++ b/orc8r/gateway/c/common/policydb/PolicyLoader.cpp
@@ -10,11 +10,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "RedisMap.hpp"
-#include "Serializers.h"
#include "PolicyLoader.h"
-#include "ServiceConfigLoader.h"
-#include "magma_logging.h"
+#include // for COMPACT_GOOGLE_LOG_INFO, LogMes...
+#include // IWYU pragma: keep
+#include // for seconds
+#include // for client, client::connect_state
+#include // for redis_error
+#include // for uint32_t
+#include // for make_shared, __shared_ptr, shar...
+#include // for operator<<, basic_ostream, size_t
+#include // for string, char_traits, operator<<
+#include // for sleep_for
+#include "ObjectMap.h" // for SUCCESS
+#include "RedisMap.hpp" // for RedisMap
+#include "Serializers.h" // for get_proto_deserializer, get_pro...
+#include "ServiceConfigLoader.h" // for ServiceConfigLoader
+#include "lte/protos/policydb.pb.h" // for PolicyRule
+#include "magma_logging.h" // for MLOG, MERROR, MDEBUG, MINFO
namespace magma {
diff --git a/orc8r/gateway/c/common/policydb/PolicyLoader.h b/orc8r/gateway/c/common/policydb/PolicyLoader.h
index 6d21eef0d939..1563c28d2c8c 100644
--- a/orc8r/gateway/c/common/policydb/PolicyLoader.h
+++ b/orc8r/gateway/c/common/policydb/PolicyLoader.h
@@ -10,10 +10,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include
-#include
-#include
-#include
+#include // for uint32_t
+#include // for atomic
+#include // for function
+#include // for vector
+#include "lte/protos/subscriberdb.pb.h" // for lte
+namespace magma {
+namespace lte {
+class PolicyRule;
+}
+} // namespace magma
namespace magma {
using namespace lte;
diff --git a/orc8r/gateway/c/common/service303/MagmaService.cpp b/orc8r/gateway/c/common/service303/MagmaService.cpp
index 868c37554ab5..7e94934048e0 100644
--- a/orc8r/gateway/c/common/service303/MagmaService.cpp
+++ b/orc8r/gateway/c/common/service303/MagmaService.cpp
@@ -10,27 +10,38 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include
-#include
-#include
-#include
-#include
-
-#include 
+
+ 
+ 
+ 
+