diff options
author | efiacor <fiachra.corcoran@est.tech> | 2023-03-14 18:19:10 +0000 |
---|---|---|
committer | efiacor <fiachra.corcoran@est.tech> | 2023-03-14 18:43:39 +0000 |
commit | 5014a4ffcfdca9a08cb172036e709c3fd93ac3d5 (patch) | |
tree | 7fc897acc32a6a8b56ed036a79eb7e442094efaf /robot/assets | |
parent | 8cbfadcfa9bd2cc1b062040f30e02f5be99e0ac8 (diff) |
[ROBOT] Clean up 5gbulkpm
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4656d05892fa16dfe4ac05a096140fd9d8a511ee
Issue-ID: OOM-3100
Diffstat (limited to 'robot/assets')
-rw-r--r-- | robot/assets/helm/pm-https-server/Chart.yaml | 2 | ||||
-rw-r--r-- | robot/assets/templates/dcaemod/compspec_with_config_volume.jinja | 61 | ||||
-rw-r--r-- | robot/assets/templates/dcaemod/compspec_without_config_volume.jinja | 57 | ||||
-rw-r--r-- | robot/assets/templates/dfc/consul.jinja | 31 | ||||
-rw-r--r-- | robot/assets/templates/dfc/notification.jinja | 2 | ||||
-rw-r--r-- | robot/assets/usecases/5gbulkpm/k8s-https.yaml | 78 | ||||
-rw-r--r-- | robot/assets/usecases/5gbulkpm/k8s-sftp.yaml | 29 | ||||
-rw-r--r-- | robot/assets/usecases/5gbulkpm/mr_clusters.json | 6 | ||||
-rw-r--r-- | robot/assets/usecases/5gbulkpm/sub.json | 10 |
9 files changed, 2 insertions, 274 deletions
diff --git a/robot/assets/helm/pm-https-server/Chart.yaml b/robot/assets/helm/pm-https-server/Chart.yaml index 6d95377a..a29ff791 100644 --- a/robot/assets/helm/pm-https-server/Chart.yaml +++ b/robot/assets/helm/pm-https-server/Chart.yaml @@ -24,4 +24,4 @@ appVersion: 1.0.1 dependencies: - name: repositoryGenerator version: x.x-x - repository: '@chart-museum' + repository: 'https://nexus3.onap.org/repository/onap-helm-testing/' diff --git a/robot/assets/templates/dcaemod/compspec_with_config_volume.jinja b/robot/assets/templates/dcaemod/compspec_with_config_volume.jinja deleted file mode 100644 index 958decd9..00000000 --- a/robot/assets/templates/dcaemod/compspec_with_config_volume.jinja +++ /dev/null @@ -1,61 +0,0 @@ -{"owner": "owner-name", "spec": -{ - "self": { - "version": "1.0.0", - "name": "{{comp_spec_name}}", - "description": "Dummy DCAE app with config volume", - "component_type": "docker" - }, - "streams": { - "subscribes": [], - "publishes": [] - }, - "services": { - "calls": [], - "provides": [] - }, - "parameters": [], - "auxilary": { - "helm": { - "service": { - "type": "ClusterIP", - "name": "{{comp_spec_name}}", - "ports": [{ - "name": "http", - "port": 80 - }] - } - }, - "healthcheck": { - "type": "HTTP", - "interval": "45s", - "timeout": "15s", - "port": 80, - "endpoint": "/" - }, - "volumes": [{ - "config_volume": { - "name": "{{config_map_name}}" - }, - "container": { - "bind": "{{volume_mount_path}}" - } - }], - "ports": [ - "80:0", - "99:0" - ], - "tls_info":{ - "cert_directory":"/opt/app/dcae-certificate/", - "use_tls": false, - "use_external_tls": false - } - }, - "artifacts": [ - { - "type": "docker image", - "uri": "docker.io/nginx:latest" - } - ] -} -}
\ No newline at end of file diff --git a/robot/assets/templates/dcaemod/compspec_without_config_volume.jinja b/robot/assets/templates/dcaemod/compspec_without_config_volume.jinja deleted file mode 100644 index 361a9934..00000000 --- a/robot/assets/templates/dcaemod/compspec_without_config_volume.jinja +++ /dev/null @@ -1,57 +0,0 @@ -{"owner": "owner-name", "spec": -{ - "self": { - "version": "1.0.0", - "name": "{{comp_spec_name}}", - "description": "Dummy DCAE app", - "component_type": "docker" - }, - "streams": { - "subscribes": [], - "publishes": [] - }, - "services": { - "calls": [], - "provides": [] - }, - "parameters": [], - "auxilary": { - "helm": { - "service": { - "type": "ClusterIP", - "name": "{{comp_spec_name}}", - "ports": [{ - "name": "http", - "port": 80 - }] - } - }, - "healthcheck": { - "type": "HTTP", - "interval": "45s", - "timeout": "15s", - "port": 80, - "endpoint": "/" - }, - "ports": [ - "80:0", - "99:0" - ], - "log_info": { - "log_directory": "/opt/logs/test" - }, - - "tls_info":{ - "cert_directory":"/opt/app/dcae-certificate/", - "use_tls": false, - "use_external_tls": false - } - }, - "artifacts": [ - { - "type": "docker image", - "uri": "docker.io/nginx:latest" - } - ] -} -}
\ No newline at end of file diff --git a/robot/assets/templates/dfc/consul.jinja b/robot/assets/templates/dfc/consul.jinja deleted file mode 100644 index f630f976..00000000 --- a/robot/assets/templates/dfc/consul.jinja +++ /dev/null @@ -1,31 +0,0 @@ -{ - "service_calls": [], - "streams_publishes": { - "PM_MEAS_FILES": { - "dmaap_info": "<<feed0>>", - "type": "data_router" - } - }, - "dmaap.certificateConfig.keyCert": "/opt/app/datafile/etc/cert/cert.p12", - "dmaap.certificateConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/p12.pass", - "dmaap.certificateConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.certificateConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.enableDmaapCertAuth": true, - "dmaap.certificateConfig.httpsHostnameVerify": {{httpsHostnameVerify}}, - "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass", - "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks", - "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass", - "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks", - "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12", - "dmaap.dmaapConsumerConfiguration.consumerId": "C12", - "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, - "sftp.security.strictHostKeyChecking": true, - "streams_subscribes": { - "dmaap_subscriber": { - "type": "message_router", - "dmaap_info": { - "topic_url": "https://message-router:3905/events/unauthenticated.VES_NOTIFICATION_OUTPUT" - } - } - } -}
\ No newline at end of file diff --git a/robot/assets/templates/dfc/notification.jinja b/robot/assets/templates/dfc/notification.jinja index 83396c29..0c28c277 100644 --- a/robot/assets/templates/dfc/notification.jinja +++ b/robot/assets/templates/dfc/notification.jinja @@ -22,7 +22,7 @@ { "name": "{{pm_file}}", "hashMap": { - "location": "https://{{https_server_host}}:443/{{pm_file}}", + "location": "http://{{https_server_host}}:8080/{{pm_file}}", "compression": "gzip", "fileFormatType": "{{fileFormatType}}", "fileFormatVersion": "{{fileFormatVersion}}" diff --git a/robot/assets/usecases/5gbulkpm/k8s-https.yaml b/robot/assets/usecases/5gbulkpm/k8s-https.yaml deleted file mode 100644 index ac1d69a1..00000000 --- a/robot/assets/usecases/5gbulkpm/k8s-https.yaml +++ /dev/null @@ -1,78 +0,0 @@ -tosca_definitions_version: cloudify_dsl_1_3 -imports: - - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml' - - 'plugin:k8splugin?version=>=3.4.2,<4.0.0' -inputs: - tag_version: - type: string - description: Docker image to be used - default: 'nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.pmhttpsserver:latest' - replicas: - type: integer - description: Number of instances - default: 1 - external_cert_cert_type: - type: string - description: Output type - default: 'PEM' - external_cert_ca_name: - type: string - description: Name of Certificate Authority configured on CertService side. - default: 'RA' - external_cert_common_name: - type: string - description: Common name which should be present in certificate. - default: 'https-server' - external_cert_sans: - type: string - description: 'List of Subject Alternative Names (SANs) which should be present - in certificate. Delimiter - , Should contain common_name value and other FQDNs - under which given component is accessible.' - default: 'https-server' - external_cert_use_external_tls: - type: boolean - description: Flag to indicate external tls enable/disable. - default: true - service_component_type: - type: string - default: "https-server" - service_component_name_override: - type: string - default: "https-server" - enable_tls: - type: boolean - default: false -node_templates: - httpsserver: - type: dcae.nodes.ContainerizedServiceComponent - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - ports: - - '80:0' - - '8080:0' - - '443:0' - properties: - service_component_type: { get_input: service_component_type } - service_component_name_override: { get_input: service_component_name_override } - image: { get_input: tag_version } - replicas: { get_input: replicas } - always_pull_image: true - tls_info: - cert_directory: '/etc/apache2/certs/' - use_tls: - get_input: enable_tls - external_cert: - external_cert_directory: '/etc/apache2/certs/' - use_external_tls: - get_input: external_cert_use_external_tls - cert_type: - get_input: external_cert_cert_type - ca_name: - get_input: external_cert_ca_name - external_certificate_parameters: - common_name: - get_input: external_cert_common_name - sans: - get_input: external_cert_sans diff --git a/robot/assets/usecases/5gbulkpm/k8s-sftp.yaml b/robot/assets/usecases/5gbulkpm/k8s-sftp.yaml deleted file mode 100644 index 568fdf2a..00000000 --- a/robot/assets/usecases/5gbulkpm/k8s-sftp.yaml +++ /dev/null @@ -1,29 +0,0 @@ -tosca_definitions_version: cloudify_dsl_1_3 -imports: - - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml' - - 'plugin:k8splugin?version=>=3.4.2,<4.0.0' -inputs: - tag_version: - type: string - description: Docker image to be used - default: 'atmoz/sftp' - replicas: - type: integer - description: Number of instances - default: 1 -node_templates: - sftpserver: - type: dcae.nodes.ContainerizedServiceComponent - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - SFTP_USERS: bulkpm:bulkpm:::upload - ports: - - '22:32222' - properties: - service_component_type: sftpserver - service_component_name_override: sftpserver - image: { get_input: tag_version } - replicas: { get_input: replicas } diff --git a/robot/assets/usecases/5gbulkpm/mr_clusters.json b/robot/assets/usecases/5gbulkpm/mr_clusters.json deleted file mode 100644 index 9e732d2a..00000000 --- a/robot/assets/usecases/5gbulkpm/mr_clusters.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "dcaeLocationName": "san-francisco", - "fqdn": "message-router", - "topicProtocol": "http", - "topicPort": "3904" -} diff --git a/robot/assets/usecases/5gbulkpm/sub.json b/robot/assets/usecases/5gbulkpm/sub.json deleted file mode 100644 index 45554b9a..00000000 --- a/robot/assets/usecases/5gbulkpm/sub.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dcaeLocationName": "san-francisco", - "fqtn": "org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS", - "clientIdentity": "dcae@dcae.onap.org", - "action": [ - "view", - "pub", - "sub" - ] -} |