From 645a5594bf3e28eb94754fc6e25c0a896b10825b Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Fri, 27 Mar 2020 14:17:29 -0500 Subject: [PATCH] HTTPS VES vLB,vLBMS and vFWs vFWDT, vFW_HPA,vFW_NextGen,vLB,vLBMS Issue-ID: INT-1319 Change-Id: I38c6115b0921cc6c709e5de3c33fcb743bf0c899 Signed-off-by: Brian Freeman --- heat/vFW/base_vfw.env | 2 +- heat/vFWCL_arm64/vFWSNK/base_vfw.env | 2 +- heat/vFWDT/vFWSNK/base_vfw.env | 2 +- heat/vFW_HPA/vFW/base_vfw.env | 2 +- heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env | 2 +- heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.env | 2 +- heat/vFW_NextGen/examples/vfw.env | 2 +- heat/vFW_NextGen/templates/vfw.env | 4 +- heat/vLB/base_vlb.env | 2 +- heat/vLBMS/base_vlb.env | 2 +- heat/vLB_HPA/base_vlb.env | 2 +- heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.env | 2 +- preload_data/defaults/preload_data.json | 2 +- vnfs/VESreporting_vLB5.0/dep.xml | 1 + vnfs/VESreporting_vLB5.0/onap-ca.crt | 100 +++++++++++++++++++++ .../VESreporting_vLB5.0/vpp_measurement_reporter.c | 12 ++- vnfs/vLB/scripts/v_lb_install.sh | 4 +- vnfs/vLBMS/scripts/v_lb_install.sh | 1 + 18 files changed, 127 insertions(+), 19 deletions(-) create mode 100644 vnfs/VESreporting_vLB5.0/onap-ca.crt diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index 0dcfddc8..e8ebf9f5 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -49,7 +49,7 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFWCL_arm64/vFWSNK/base_vfw.env b/heat/vFWCL_arm64/vFWSNK/base_vfw.env index c408df50..541dc4aa 100644 --- a/heat/vFWCL_arm64/vFWSNK/base_vfw.env +++ b/heat/vFWCL_arm64/vFWSNK/base_vfw.env @@ -43,7 +43,7 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFWDT/vFWSNK/base_vfw.env b/heat/vFWDT/vFWSNK/base_vfw.env index e6447137..633c95e7 100755 --- a/heat/vFWDT/vFWSNK/base_vfw.env +++ b/heat/vFWDT/vFWSNK/base_vfw.env @@ -27,7 +27,7 @@ parameters: vnf_id: vFirewall_demo_app vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT nexus_artifact_repo: https://nexus.onap.org diff --git a/heat/vFW_HPA/vFW/base_vfw.env b/heat/vFW_HPA/vFW/base_vfw.env index 9d61379c..6f0dffb8 100644 --- a/heat/vFW_HPA/vFW/base_vfw.env +++ b/heat/vFW_HPA/vFW/base_vfw.env @@ -31,7 +31,7 @@ parameters: vnf_id: vFirewall_demo_app vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env index d6fb913b..c83b70ab 100644 --- a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env @@ -28,7 +28,7 @@ parameters: vnf_id: vFirewall_demo_app vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.env b/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.env index 54597141..0724c108 100644 --- a/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.env +++ b/heat/vFW_HPA/vFW_SRIOV_NIC/base_vfw.env @@ -33,7 +33,7 @@ parameters: vnf_id: vFirewall_demo_app vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFW_NextGen/examples/vfw.env b/heat/vFW_NextGen/examples/vfw.env index b191bf5a..4da88508 100644 --- a/heat/vFW_NextGen/examples/vfw.env +++ b/heat/vFW_NextGen/examples/vfw.env @@ -19,7 +19,7 @@ parameters: vnf_id: vFirewall_demo_app vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFW_NextGen/templates/vfw.env b/heat/vFW_NextGen/templates/vfw.env index efa04466..573cc814 100644 --- a/heat/vFW_NextGen/templates/vfw.env +++ b/heat/vFW_NextGen/templates/vfw.env @@ -23,10 +23,10 @@ parameters: vnf_name: vFW_NextGen vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vfw_key cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE - nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file + nexus_artifact_repo: https://nexus.onap.org diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index fd69da82..2146ff81 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -25,7 +25,7 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vlb_key diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index 56bec98a..b0c1473e 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -48,7 +48,7 @@ parameters: gre_ipaddr: 192.168.10.112 pg_int: 192.168.9.109 dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 30235 + dcae_collector_port: 30417 nb_api_version: 1.2.0 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT diff --git a/heat/vLB_HPA/base_vlb.env b/heat/vLB_HPA/base_vlb.env index 89d5487c..f7f151b9 100644 --- a/heat/vLB_HPA/base_vlb.env +++ b/heat/vLB_HPA/base_vlb.env @@ -27,7 +27,7 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 8081 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vlb_key diff --git a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.env b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.env index 6790b972..8f36f178 100644 --- a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.env +++ b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.env @@ -36,7 +36,7 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 - dcae_collector_port: 8081 + dcae_collector_port: 30417 demo_artifacts_version: 1.6.0-SNAPSHOT install_script_version: 1.6.0-SNAPSHOT key_name: vlb_key diff --git a/preload_data/defaults/preload_data.json b/preload_data/defaults/preload_data.json index f138fa33..8287f005 100644 --- a/preload_data/defaults/preload_data.json +++ b/preload_data/defaults/preload_data.json @@ -9,7 +9,7 @@ "onap_private_net_cidr": "${GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR}", "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", "dcae_collector_ip": "${GLOBAL_INJECTED_DCAE_COLLECTOR_IP}", - "dcae_collector_port": "30235", + "dcae_collector_port": "30417", "public_net_id": "${GLOBAL_INJECTED_PUBLIC_NET_ID}", "cloud_env": "${GLOBAL_INJECTED_CLOUD_ENV}", "install_script_version": "${GLOBAL_INJECTED_SCRIPT_VERSION}" diff --git a/vnfs/VESreporting_vLB5.0/dep.xml b/vnfs/VESreporting_vLB5.0/dep.xml index fc18229f..73c980b8 100644 --- a/vnfs/VESreporting_vLB5.0/dep.xml +++ b/vnfs/VESreporting_vLB5.0/dep.xml @@ -15,6 +15,7 @@ *.md *.TXT *.c + *.crt Makefile diff --git a/vnfs/VESreporting_vLB5.0/onap-ca.crt b/vnfs/VESreporting_vLB5.0/onap-ca.crt new file mode 100644 index 00000000..51e19b56 --- /dev/null +++ b/vnfs/VESreporting_vLB5.0/onap-ca.crt @@ -0,0 +1,100 @@ +-----BEGIN CERTIFICATE----- +MIIFpTCCA42gAwIBAgIJAJqx8dKnCZZoMA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD +VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV +BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl +bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn +MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy +ODIxMTQyNloXDTIxMTEyNzIxMTQyNlowga0xCzAJBgNVBAYTAlVTMQswCQYDVQQI +DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw +EQYDVQQLDApzaW1wbGVkZW1vMSowKAYDVQQDDCFPcGVuRUNPTVAgc2ltcGxlZGVt +byBTZXJ2ZXIgQ0EgWDExJzAlBgkqhkiG9w0BCQEWGHNpbXBsZWRlbW9Ab3BlbmVj +b21wLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALr4rivKQuRk +YNf5Ig40e1nqj6s6LB1vgMOYbKfRziOFpPcUpsHPOhusHowiUsrU1vdFSzPz6Ej7 +PjlmNSg2Qka8YCn9kd6QgM7U0KcPJvIucBp+qjifH3EvP0jgDPhDeVRYxzV454dv +5kQ9uCpswJP7YAnX51dkWeH8nwPUoagt31bOl9LXENSrgxEThxdLYMJnQJWk2CmV +otXM4tT1dxyJxFUrZ6uJCEAYw5VtlplqihHf8lHy+sWQavtsLz/4dc+sGeXSTfoI +voKvoh3uZ5gEhGV8yfJxk1veX5y5/AxP80vQ+smWYjTnQL5QQ57y4bciez4XVBmQ +SWimWtOi4e8CAwEAAaOBtTCBsjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBhjAdBgNVHQ4EFgQUTqdsYgGNGubdJHq9tsaJhM9HE5wwcAYDVR0gBGkwZzBl +BgRVHSAAMF0wWwYIKwYBBQUHAgIwTxpNSWYgeW91IHRydXN0IHRoaXMgY2VydCB0 +aGVuIHdlIGhhdmUgYSBicmlkZ2UgdGhhdCB5b3UgbWlnaHQgYmUgaW50ZXJlc3Rl +ZCBpbi4wDQYJKoZIhvcNAQELBQADggIBAKNNlRqFuE/JgV1BHyYK0xoSXH4aZP/7 +IoHtDVcSaZAOOuFOUrwVMUbzRBebbb6RpFwt/X+NLFUGysd+XNLF7W7lzxKtmFNX +n4OpNkBe0y5O7yurus8rERHzu3jiOSgVo+WzDlGpYSRnG3hI2qPWqD+Puzx/WwI8 +XUTuzEQQ3gUSyVFfXHpay3VpYmLZiLJ9WKY5SDw7Ie6Sxrju4Qm1HwnFY8wHZGcs +2KMQzorJ1ZNQf523yUTghbT0rKaSFaD8zugPtI2ONfFG/QgrkQXo78opzPsHnHwa +SxGSiAgeLbwAUCvPNl27zr6k6+7TcNjV0VUivAs0OG3VEAdgi7UWYB+30KfWwHwE +zGmvd4IAGqIqlqLcSVArN5z8JK1B5nfjQn5UrclU1vK+dnuiKE2X4rKuBTRYRFR/ +km+mj4koYFPKFHndmJl1uv2OCJK9l5CSIuKWeI1qv8BASKqgNdoT/SKBXqxgYlCb +o+j4IDjxrxChRO+e5vl9lA7INfRrbljCkUjfLRa+v2q9tWQ3+EQUwwnSrSfihh2T +j0Tksr6b8dDsvMlCdOKG1B+JPcEXORSFKNXVTEfjqpJG8s16kFAocWt3S6xO0k1t +qbQp+3tWQgW2TGnX0rMZzB6NGRNfWhlYmq2zHgXkiCIZ26Ztgt/LNbwEvN3+VlLo +z/Rd+SKtlrfb +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGQTCCBCmgAwIBAgIJANSi/bsXEOI5MA0GCSqGSIb3DQEBCwUAMIG9MQswCQYD +VQQGEwJVUzELMAkGA1UECAwCTkoxEzARBgNVBAcMCkJlZG1pbnN0ZXIxEjAQBgNV +BAoMCU9wZW5FQ09NUDETMBEGA1UECwwKc2ltcGxlZGVtbzE6MDgGA1UEAwwxT3Bl +bkVDT01QIHNpbXBsZWRlbW8gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEn +MCUGCSqGSIb3DQEJARYYc2ltcGxlZGVtb0BvcGVuZWNvbXAub3JnMB4XDTE2MTEy +ODIxMTQyNVoXDTI2MTEyNjIxMTQyNVowgb0xCzAJBgNVBAYTAlVTMQswCQYDVQQI +DAJOSjETMBEGA1UEBwwKQmVkbWluc3RlcjESMBAGA1UECgwJT3BlbkVDT01QMRMw +EQYDVQQLDApzaW1wbGVkZW1vMTowOAYDVQQDDDFPcGVuRUNPTVAgc2ltcGxlZGVt +byBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MScwJQYJKoZIhvcNAQkBFhhz +aW1wbGVkZW1vQG9wZW5lY29tcC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQDLgdDTCZX5xlMFIo+tjj5DItAwbutQE3NMchx/CRIuYwRCBOEO0yOs +AdnZAuheYrjv/Dw4wKNzcvtIlYbfiPsGWVvx5j6+xoGBLLwIOnDyzD2B62uCvMs9 +47MAuiqpPojPwDDb9fF5EIhlC+cBzSYKm7D5ihYxmUCnh9yHIPEMq0IoVj2illlK +eCTLW+bZKeaKoWdkFxyyzykOoMFgZTUm01EhDIt1DHTve675Qq80UgzrZdSK6Zjv +3wLV7tkJSGmCkbUELpxsTLKYuaGUkE0m5n3SMUcvBDa6WNQpWlUbZlTwWotOrxfN +Gib3nGiqyCmQXrVvuuBDzmZifZaJpBGiiGiOxp0j79E/OZkfk/9V3Hvfy78Ss9H5 +uhf/ACGKsUq9nN25u+Wpz7EzAQm/OBubBrBCMP/8pm+y1jCfQ6Bwd0Nm48KrJkTe +ySkferISNmpQZ2dyZXQVXMarbRfagQ6XdJw6EVnDwydVzb5LAqam3JUXjsHIj7Gv +2DmXwJtwV+cnKB/OxRsP/JWwlyC9pFGy17HWc7EwPqXm1UNdDM36UaoBDzsh3DcI +vg5+BOOtYPmiZ2+CMD2JxAXmtCMAmQA1mSsW7beTuHKy+7EdCAWcregE60PE3w2l +G8n50YSXb0WZ2IaQUsBhhpZmu6VVTEcoi5eMglI6QyO21y0oKPYWPQIDAQABo0Iw +QDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmmQF +QD3oWZUOVE81Qc9WSfcyqwwwDQYJKoZIhvcNAQELBQADggIBAE1ArwZwMVVJe1Pj +p1R9+Q766Qhzh4EN9RFCsktCcf4pB23lPtFhMhIZJP5eZKLB4MUIvtmleU+DmOWf +jcEcgauMrc9Ihacra+IRJsr4JQjQSDHoEgl/yR6VUd9vbGH66ElIg9nP7XWAE6h5 +DTAxA8X1qyUOVGsKAps2uhBwNtl8RdX6GrZahkSOUMOq3H4wyEEPQlpU2AewZqOU +p0vdbQ/is6cbJh6dgxFrSzBti/MKj/EPM6yJwlO+RfGlJmEI7J7bLEYIeNssLnv6 +FGiOgyWQ+gmwVK827F4Jwoght2BCcNsG/oPkAPbdw4yRIyi92QSWMEBKibECypQE +a1DYvfHWGQLQifGzFuJTOca9vgu2B/BQ+0Ii4DqMS8hc2rw1CAD5zHAT/BIgAKM6 +ygL5Oyvrj8AQLgOkjhFh0HFKneh4j7wBtibpmDnBoSv227PAtdytCoRgivjhmF5B +Ryx7BswcTEtZHWHxD/i2wlMEGNqGbcRmCCy9hhCxitAz70aq3Y/pC46n7w5bOmvJ +Ap9D+WmTJ9PdpDjiwCXCkMD3QaTuUV1W3Zr4mLLj6gRLb6ycgDrsqXnY6/JB/AOd +gxFK9q1vjhm02FAABIa+kL10CKPuRdlE/GsWl03WKMeT5bY3MTO3odsNXhKWA19h +wUAp0gnljuFHPX7jWwruZ1eD8mQv +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFPjCCAyagAwIBAgIJAJ6u7cCnzrWdMA0GCSqGSIb3DQEBCwUAMCwxDjAMBgNV +BAsMBU9TQUFGMQ0wCwYDVQQKDARPTkFQMQswCQYDVQQGEwJVUzAeFw0xODA0MDUx +NDE1MjhaFw0zODAzMzExNDE1MjhaMCwxDjAMBgNVBAsMBU9TQUFGMQ0wCwYDVQQK +DARPTkFQMQswCQYDVQQGEwJVUzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAMA5pkgRs7NhGG4ew5JouhyYakgYUyFaG121+/h8qbSdt0hVQv56+EA41Yq7 +XGie7RYDQK9NmAFF3gruE+6X7wvJiChp+Cyd7sFMnb65uWhxEdxWTM2BJFrgfzUn +H8ZCxgaCo3XH4PzlKRy2LQQJEJECwl/RZmRCXijMt5e9h8XoZY/fKkKcZZUsWNCM +pTo266wjvA9MXLmdgReRj0+vrCjrNqy+htwJDztoiHWiYPqT6o8EvGcgjNqjlZx7 +NUNf8MfLDByqKF6+wRbHv1GKjn3/Vijd45Fv8riyRYROiFanvbV6jIfBkv8PZbXg +2VDWsYsgp8NAvMxK+iV8cO+Ck3lBI2GOPZbCEqpPVTYbLUz6sczAlCXwQoPzDIZY +wYa3eR/gYLY1gP2iEVHORag3bLPap9ZX5E8DZkzTNTjovvLk8KaCmfcaUMJsBtDd +ApcUitz10cnRyZc1sX3gE1f3DpzQM6t9C5sOVyRhDcSrKqqwb9m0Ss04XAS9FsqM +P3UWYQyqDXSxlUAYaX892u8mV1hxnt2gjb22RloXMM6TovM3sSrJS0wH+l1nznd6 +aFXftS/G4ZVIVZ/LfT1is4StoyPWZCwwwly1z8qJQ/zhip5NgZTxQw4mi7ww35DY +PdAQOCoajfSvFjqslQ/cPRi/MRCu079heVb5fQnnzVtnpFQRAgMBAAGjYzBhMB0G +A1UdDgQWBBRTVTPyS+vQUbHBeJrBKDF77+rtSTAfBgNVHSMEGDAWgBRTVTPyS+vQ +UbHBeJrBKDF77+rtSTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAN +BgkqhkiG9w0BAQsFAAOCAgEAPx/IaK94n02wPxpnYTy+LVLIxwdq/kawNd6IbiMz +L87zmNMDmHcGbfoRCj8OkhuggX9Lx1/CkhpXimuYsZOFQi5blr/u+v4mIbsgbmi9 +7j+cUHDP0zLycvSvxKHty51LwmaX9a4wkJl5zBU4O1sd/H9tWcEmwJ39ltKoBKBx +c94Zc3iMm5ytRWGj+0rKzLDAXEWpoZ5bE5PLJauA6UDCxDLfs3FwhbS7uDggxYvf +jySF5FCNET94oJ+m8s7VeHvoa8iPGKvXrIqdd7XDHnqJJlVKr7m9S0fMbyEB8ci2 +RtOXDt93ifY1uhoEtEykn4dqBSp8ezvNMnwoXdYPDvTd9uCAFeWFLVreBAWxd25h +PsBTkZA5hpa/rA+mKv6Af4VBViYr8cz4dZCsFChuioVebe9ighrfjB//qKepFjPF +CyjzKN1u0JKm/2x/ORqxkTONG8p3uDwoIOyimUcTtTMv42bfYD88RKakqSFXE9G+ +Z0LlaKABqfjK49o/tsAp+c5LoNlYllKhnetO3QAdraHwdmC36BhoghzR1jpX751A +cZn2VH3Q4XKyp01cJNCJIrua+A+bx6zh3RyW6zIIkbRCbET+UD+4mr8WIcSE3mtR +ZVlnhUDO4z9//WKMVzwS9Rh8/kuszrGFI1KQozXCHLrce3YP6RYZfOed79LXaRwX +dYY= +-----END CERTIFICATE----- diff --git a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c index d641f95f..66368431 100644 --- a/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c +++ b/vnfs/VESreporting_vLB5.0/vpp_measurement_reporter.c @@ -122,6 +122,10 @@ int main(int argc, char** argv) char* vnic = argv[3]; char* fqdn2 = NULL; int port2 = 0; + char* caFile = "/opt/config/onap-ca.crt"; + char* userName = "sample1"; + char* passWord = "sample1"; + if(argc == 6) { @@ -157,15 +161,15 @@ int main(int argc, char** argv) NULL, /* optional path */ NULL, /* optional topic */ 100, /* Ring Buffer size */ - 0, /* HTTPS? */ + 1, /* HTTPS? */ NULL, /* cert file */ NULL, /* key file */ - NULL, /* ca info */ + caFile, /* ca info */ NULL, /* ca file */ 0, /* verify peer */ 0, /* verify host */ - "sample1", /* Username */ - "sample1", /* Password */ + userName, /* Username */ + passWord, /* Password */ "sample1", /* Username2 */ "sample1", /* Password2 */ NULL, /* Source ip */ diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh index 72bc4163..08362b86 100644 --- a/vnfs/vLB/scripts/v_lb_install.sh +++ b/vnfs/vLB/scripts/v_lb_install.sh @@ -85,6 +85,8 @@ tar -zmxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting +cp /opt/VES/evel/evel-library/code/VESreporting/onap-ca.crt /opt/config/onap-ca.crt + mv dns-manager-$DEMO_ARTIFACTS_VERSION.jar /opt/FDserver/dns-manager-$DEMO_ARTIFACTS_VERSION.jar mv dnsmembership.sh /opt/FDserver/dnsmembership.sh mv add_dns.sh /opt/FDserver/add_dns.sh @@ -130,4 +132,4 @@ then reboot fi -./v_lb_init.sh \ No newline at end of file +./v_lb_init.sh diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh index 2dbb73d3..86218579 100644 --- a/vnfs/vLBMS/scripts/v_lb_install.sh +++ b/vnfs/vLBMS/scripts/v_lb_install.sh @@ -82,6 +82,7 @@ mv ves-$DEMO_ARTIFACTS_VERSION VES tar -zmxvf ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION VESreporting_vLB mv VESreporting_vLB /opt/VES/evel/evel-library/code/VESreporting +cp /opt/VES/evel/evel-library/code/VESreporting/onap-ca.crt /opt/config/onap-ca.crt # Download Honeycomb artifacts wget -O vlb-vnf-onap-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf&a=vlb-vnf-onap-distribution&c=hc&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" -- 2.16.6