aboutsummaryrefslogtreecommitdiffstats
path: root/asdctool/src
AgeCommit message (Collapse)AuthorFilesLines
2020-09-07Template design (NSSTs) for slice sub-nets (RAN, Core, Transport).hekeguang1-0/+418
Issue-ID: SDC-3086 Change-Id: Ib70da9e03d6dd152d901344c60f8ba47f38450fe Signed-off-by: hekeguang <hekeguang@chinamobile.com>
2020-07-29Improve Utils coverage and improve Sonar scoreJulienBe3-202/+165
Issue-ID: SDC-3131 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: I784a0ad563141dfb546ec1d227b3eb03e08faef3
2020-07-09Clean ValidatorExecutor hierarchyFrancis Toth15-484/+133
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I9d919b1d57eac1d25c8b3874366c2cb9e906923a Issue-ID: SDC-2499
2020-07-07Add test contracts for ValidatorExecutor and TopologyTemplateValidatorExecutorFrancis Toth7-103/+76
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I10f0de565588e0bc7cd0f47ba7f714eab3f1f7f7 Issue-ID: SDC-2499
2020-07-05Fix sonar issuessebdet1-43/+25
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ib6ee78fd5756d615c2a103ac0d7d26070fd24206
2020-07-05Fix sonar issuessebdet3-63/+45
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Change-Id: Ic29f9233838e25c195d2b349bfac8e6d56888609 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-07-05Fix sonar issuessebdet1-22/+16
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I0ae188c5f0e2d96fd94de66fe0dcd0c47bcd9af5
2020-07-05Clean CsarUtils::MainYamlWithDependenciesFrancis Toth3-8/+4
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I593dd7bb6a20445899a14da793e8c550e1e14e09 Issue-ID: SDC-2812
2020-06-30Fix typo in package name and classesFrancis Toth24-66/+66
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I55a6efeb4a0c2b4734dc3a091afbc6295599c74b Issue-ID: SDC-2499
2020-06-25Cleaned up ArtifactValidatorExecuter and IArtifactValidatorExecutorFrancis Toth19-286/+189
This commit intends to clean the tests related to ArtifactValidatorExecuter and IArtifactValidatorExecutor by introducing the concept of test contract. Some renaming have to be done to fix the typo in Executer (it should be named Executor), hence the number of changes. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I5cd4512c425ae01f4f1118c9d61e6fce3df94f1d Issue-ID: SDC-2499
2020-06-23Decouple TXT Report file writing and formatting logic (6/6)Francis Toth20-222/+136
This commit moves the writeReportLineToFile from ReportManager to ReportFile, deletes ReportManager (as it's not longer used), and finalizes the decoupling between the writing and the formatting logic of the TXT Report file. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ia5cce71535ea808e6e24807ed62ae9b262eab6ad Issue-ID: SDC-2499
2020-06-23Decouple TXT Report file writing and formatting logic (5/6)Francis Toth6-36/+60
This commit aims to move the reportEndOfToolRun function from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I17731864c34ed9a70b1b1e91b89bad835dc72449 Issue-ID: SDC-2499
2020-06-22Decouple TXT Report file writing and formatting logic (4/6)Francis Toth4-23/+26
This commit aims to move the reportValidatorTypeSummary function from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I30898d69bbcdb129a2dac917c4dee3c276556e91 Issue-ID: SDC-2499
2020-06-21Decouple TXT Report file writing and formatting logic (3/6)Francis Toth4-20/+23
This commit aims to move the printValidationTaskStatus function's logic from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ic33a519f4c70276d404a83bf7de8a27f0007b285 Issue-ID: SDC-2499
2020-06-21Toggletalio1-1/+1
Add toggling mechanism to catalog side. The first toggleable feature is healing - this was added to healing flow, in healJanusGraphDao Issue-ID: SDC-2874 Signed-off-by: talio <talio@amdocs.com> Change-Id: If386651cab8304ebaf13497ded3a7a50bd60e477 Signed-off-by: talio <talio@amdocs.com>
2020-06-21Fix sonar issuessebdet4-33/+24
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3116 Change-Id: I87802cc9edb378bdbe456c3ca4f10d8c6ebe9425 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-06-21Decouple TXT Report file writing and formatting logic (2/6)Francis Toth4-14/+15
This commit aims to move the reportStartValidatorRun function's logic from ReportManager (deprecated) to ReportFile. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I93c2e8f98cdef598094647d734d0deec0f1941db Issue-ID: SDC-2499
2020-06-19Decouple TXT Report file writing and formatting logic (1/6)Francis Toth15-49/+138
This commit is the first of a series aiming to decouple the writing and formatting logic of text report files in the asdc tool. Unfortunately because of a significant amount of technical debt, a small hack had to be done so that the header of the file is not written twice. This will be removed in a future change. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I8d2a7c1353d59562d8026088824c26ae0daa36e9 Issue-ID: SDC-2499
2020-06-18Decouple CSV Report file writing and formatting logicFrancis Toth11-62/+303
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I6168b71bb54192a806ff6aa437788bedad933c76 Issue-ID: SDC-2499
2020-06-15Fix bug in UpdateIsVnfMenuxuegao1-2/+2
Fix the unboxing bug reported by Sonar. Issue-ID: SDC-3112 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: I4ed3f9a48ad21af2f9f67872791df2796c4e4ad1
2020-06-10Set properties on XML parsers to prevent XXE attackNeil Derraugh1-0/+4
- Set ACCESS_EXTERNAL_DTD and ACCESS_EXTERNAL_SCHEMA properties on XML parsers to prevent XXE attacks Issue-ID: SDC-3106 Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com> Change-Id: If4e835858dd3d718d37b3ee41fb2fd0c94574c24
2020-05-28Encapsulate ReportManager's failedVerticesPerTask and resultsPerVertex in ReportFrancis Toth22-113/+197
This commit aims to encapsulate the static fields failedVerticesPerTask and resultsPerVertex in their own class (called Report). In the short terms, any state needing to be passed around will be stored there. Unfortunately, this commit required many minor changes in functions signature (to pass the Report instance). Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I3756d9a939cbd0f2856be72aa2bd24a3980dde49 Issue-ID: SDC-2499
2020-05-24Fix potential NullPointer in SchemaFileImport-4550/+2784
Issue-ID: SDC-2724 Signed-off-by: ys9693 <ys9693@att.com> Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_be1_name} # wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } be1_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } be1_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } be1_port_5: type: OS::Neutron::Port properties: network: { get_param: Cricket_OCS_protected_net_id } fixed_ips: [{"ip_address": {get_param: be1_Cricket_OCS_protected_ips}}] be1_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: be1_OAM_direct_ips}}] server_scp_be2: type: OS::Nova::Server # depends on: db_wait_condition properties: name: { get_param: vm_scp_be2_name } image: { get_param: image_scp_be_id } # availability_zone: { get_param: availability_zone_be2 } flavor: { get_param: flavor_scp_be_id } scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - port: { get_resource: be2_port_3 } - port: { get_resource: be2_port_4 } - port: { get_resource: be2_port_5 } - port: { get_resource: be2_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_be2_name} # wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } be2_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } be2_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } be2_port_5: type: OS::Neutron::Port properties: network: { get_param: Cricket_OCS_protected_net_id } fixed_ips: [{"ip_address": {get_param: be2_Cricket_OCS_protected_ips}}] be2_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: be2_OAM_direct_ips}}] server_scp_be3: type: OS::Nova::Server # depends on: db_wait_condition properties: name: { get_param: vm_scp_be3_name } image: { get_param: image_scp_be_id } # availability_zone: { get_param: availability_zone_be3 } flavor: { get_param: flavor_scp_be_id } scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - port: { get_resource: be3_port_3 } - port: { get_resource: be3_port_4 } - port: { get_resource: be3_port_5 } - port: { get_resource: be3_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_be3_name} # wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } be3_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } be3_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } be3_port_5: type: OS::Neutron::Port properties: network: { get_param: Cricket_OCS_protected_net_id } fixed_ips: [{"ip_address": {get_param: be3_Cricket_OCS_protected_ips}}] be3_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: be3_OAM_direct_ips}}] server_scp_be4: type: OS::Nova::Server # depends on: db_wait_condition properties: name: { get_param: vm_scp_be4_name } image: { get_param: image_scp_be_id } # availability_zone: { get_param: availability_zone_be4 } flavor: { get_param: flavor_scp_be_id } scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - port: { get_resource: be4_port_3 } - port: { get_resource: be4_port_4 } - port: { get_resource: be4_port_5 } - port: { get_resource: be4_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_be4_name} # wc_notify: { get_attr: ['scp_be_wait_handle', 'curl_cli'] } be4_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } be4_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } be4_port_5: type: OS::Neutron::Port properties: network: { get_param: Cricket_OCS_protected_net_id } fixed_ips: [{"ip_address": {get_param: be4_Cricket_OCS_protected_ips}}] be4_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: be4_OAM_direct_ips}}] server_scp_fe0: type: OS::Nova::Server # depends on: scp_be_wait_condition properties: name: { get_param: vm_scp_fe0_name } image: { get_param: image_scp_fe_id } # availability_zone: { get_param: availability_zone_fe0 } flavor: { get_param: flavor_scp_fe_id } scheduler_hints: { group: { get_resource: FE_Affinity } } networks: - port: { get_resource: fe0_port_0 } - port: { get_resource: fe0_port_2 } - port: { get_resource: fe0_port_3 } - port: { get_resource: fe0_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_fe0_name} # wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } fe0_port_0: type: OS::Neutron::Port properties: network: { get_param: SIGNET_vrf_A1_direct_net_id } fixed_ips: [{"ip_address": {get_param: fe0_SIGNET_vrf_A1_direct_ips}}] fe0_port_2: type: OS::Neutron::Port properties: network_id: { get_resource: FE_Clustering_KA } fe0_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } fe0_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: fe0_OAM_direct_ips}}] server_scp_fe1: type: OS::Nova::Server # depends on: scp_be_wait_condition properties: name: { get_param: vm_scp_fe1_name } image: { get_param: image_scp_fe_id } # availability_zone: { get_param: availability_zone_fe1 } flavor: { get_param: flavor_scp_fe_id } scheduler_hints: { group: { get_resource: FE_Affinity } } networks: - port: { get_resource: fe1_port_1 } - port: { get_resource: fe1_port_2 } - port: { get_resource: fe1_port_3 } - port: { get_resource: fe1_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_scp_fe1_name} # wc_notify: { get_attr: ['scp_fe_wait_handle', 'curl_cli'] } fe1_port_1: type: OS::Neutron::Port properties: network: { get_param: SIGNET_vrf_B1_direct_net_id } fixed_ips: [{"ip_address": {get_param: fe1_SIGNET_vrf_B1_direct_ips}}] fe1_port_2: type: OS::Neutron::Port properties: network_id: { get_resource: FE_Clustering_KA } fe1_port_3: type: OS::Neutron::Port properties: network_id: { get_resource: Clustering_Network } fe1_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: fe1_OAM_direct_ips}}] server_smp0: type: OS::Nova::Server properties: name: { get_param: vm_smp0_name } image: { get_param: image_smp_id } # availability_zone: { get_param: availability_zone_smp0 } flavor: { get_param: flavor_smp_id } scheduler_hints: { group: { get_resource: SMP_Affinity } } networks: - port: { get_resource: smp0_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_smp0_name} # wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } smp0_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: smp0_OAM_direct_ips}}] server_smp1: type: OS::Nova::Server properties: name: { get_param: vm_smp1_name } image: { get_param: image_smp_id } # availability_zone: { get_param: availability_zone_smp1 } flavor: { get_param: flavor_smp_id } scheduler_hints: { group: { get_resource: SMP_Affinity } } networks: - port: { get_resource: smp1_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_smp1_name} # wc_notify: { get_attr: ['smp_wait_handle', 'curl_cli'] } smp1_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: smp1_OAM_direct_ips}}] server_db0: type: OS::Nova::Server # depends_on: smp_wait_condition properties: name: { get_param: vm_db0_name } image: { get_param: image_db_id } # availability_zone: { get_param: availability_zone_db0 } flavor: { get_param: flavor_db_id } scheduler_hints: { group: { get_resource: DB_Affinity } } networks: - port: { get_resource: db0_port_4 } - port: { get_resource: db0_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_db0_name} # wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } db0_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } db0_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: db0_OAM_direct_ips}}] server_db1: type: OS::Nova::Server # depends_on: smp_wait_condition properties: name: { get_param: vm_db1_name } image: { get_param: image_db_id } # availability_zone: { get_param: availability_zone_db1 } flavor: { get_param: flavor_db_id } scheduler_hints: { group: { get_resource: DB_Affinity } } networks: - port: { get_resource: db1_port_4 } - port: { get_resource: db1_port_7 } metadata: vnf_id: { get_param: vnf_id } user_data: str_replace: template: | #!/bin/bash #todo: provision $vm_name wc_notify --data-binary '{"status": "SUCCESS"}' params: $vm_name: {get_param: vm_db1_name} # wc_notify: { get_attr: ['db_wait_handle', 'curl_cli'] } db1_port_4: type: OS::Neutron::Port properties: network_id: { get_resource: DB_Network } db1_port_7: type: OS::Neutron::Port properties: network: { get_param: OAM_direct_net_id } fixed_ips: [{"ip_address": {get_param: db1_OAM_direct_ips}}]