diff options
37 files changed, 479 insertions, 70 deletions
diff --git a/.gitignore b/.gitignore index b26692db9..209db726c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ env.properties *~ .checkstyle .DS_Store +devtool/ +seccom/ diff --git a/S3Ptools/Jmeter/Jmeter.sh b/S3Ptools/Jmeter/Jmeter.sh new file mode 100644 index 000000000..46c37305c --- /dev/null +++ b/S3Ptools/Jmeter/Jmeter.sh @@ -0,0 +1,6 @@ +#!/bin/bash +wget http://redrockdigimark.com/apachemirror//jmeter/binaries/apache-jmeter-4.0.tgz +tar -xf apache-jmeter-4.0.tgz +cd apache-jmeter-4.0/bin/ +\rm -rf apache-jmeter-4.0.tgz +./jmeter diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env index b17b9908b..3c5136405 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env index bc195e670..26492c8f9 100644 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env index e94170e3c..5757d40c3 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env @@ -18,7 +18,7 @@ parameters: pullPolicy: Always robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" - openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9" + openStackPublicNetId: "__oam_network_id__" openStackPassword: "${OS_PASSWORD}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env index e94170e3c..5757d40c3 100644 --- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env +++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env @@ -18,7 +18,7 @@ parameters: pullPolicy: Always robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" - openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9" + openStackPublicNetId: "__oam_network_id__" openStackPassword: "${OS_PASSWORD}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index e94170e3c..5757d40c3 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -18,7 +18,7 @@ parameters: pullPolicy: Always robot: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" - openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9" + openStackPublicNetId: "__oam_network_id__" openStackPassword: "${OS_PASSWORD}" openStackTenantId: "${OS_PROJECT_ID}" openStackUserName: "${OS_USERNAME}" @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env index 0e5d76d46..76d3ef648 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -28,6 +28,8 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "10.0.0.0/16" openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" so: config: openStackUserName: "${OS_USERNAME}" diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index c290e17cd..9cf44e41c 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -138,6 +138,7 @@ resources: __integration_override_yaml__: { get_param: integration_override_yaml } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } + __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } __k8s_vm_ips__: [ get_attr: [k8s_1_floating_ip, floating_ip_address], get_attr: [k8s_2_floating_ip, floating_ip_address], @@ -146,6 +147,8 @@ resources: get_attr: [k8s_5_floating_ip, floating_ip_address], get_attr: [k8s_6_floating_ip, floating_ip_address], get_attr: [k8s_7_floating_ip, floating_ip_address], + get_attr: [k8s_8_floating_ip, floating_ip_address], + get_attr: [k8s_9_floating_ip, floating_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -378,6 +381,72 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_8_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_8_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_8_private_port } + + k8s_8_vm: + type: OS::Nova::Server + properties: + name: k8s_8 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + networks: + - port: { get_resource: k8s_8_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + + k8s_9_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_9_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_9_private_port } + + k8s_9_vm: + type: OS::Nova::Server + properties: + name: k8s_9 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + networks: + - port: { get_resource: k8s_9_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -411,3 +480,11 @@ outputs: description: The IP address of the k8s_7 instance value: { get_attr: [k8s_7_floating_ip, floating_ip_address] } + k8s_8_vm_ip: + description: The IP address of the k8s_8 instance + value: { get_attr: [k8s_8_floating_ip, floating_ip_address] } + + k8s_9_vm_ip: + description: The IP address of the k8s_9 instance + value: { get_attr: [k8s_9_floating_ip, floating_ip_address] } + diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index a729b6bab..78fe455a0 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -12,6 +12,7 @@ __integration_override_yaml__ EOF sed -i 's/\_\_oam_network_id__/__oam_network_id__/g' /opt/config/integration-override.yaml sed -i 's/\_\_oam_subnet_id__/__oam_subnet_id__/g' /opt/config/integration-override.yaml +sed -i 's/\_\_k8s_1_vm_ip__/__k8s_1_vm_ip__/g' /opt/config/integration-override.yaml cp /opt/config/integration-override.yaml /root echo `hostname -I` `hostname` >> /etc/hosts @@ -170,11 +171,19 @@ done # Install using OOM export HOME=/root +# update and initialize git +apt-get -y install git +git config --global user.email root@rancher +git config --global user.name root@rancher +git config --global log.decorate auto + # Clone OOM: cd ~ git clone -b master http://gerrit.onap.org/r/oom cd oom git log -1 +git tag -a "deploy0" -m "initial deployment" +git checkout -b workarounds # Run ONAP: cd ~/oom/kubernetes/ diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 19e7b60b1..41d511391 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -1,6 +1,12 @@ #!/bin/bash -NUM_K8S_VMS=7 +if [ "$#" -ne 1 ]; then + echo This script generates the HEAT template for X number of k8s VMs + echo "$0 <num k8s vms>" + exit 1 +fi +NUM_K8S_VMS=$1 + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` diff --git a/test/csit/plans/appc/healthcheck/setup.sh b/test/csit/plans/appc/healthcheck/setup.sh index afc95204a..da441ea54 100755 --- a/test/csit/plans/appc/healthcheck/setup.sh +++ b/test/csit/plans/appc/healthcheck/setup.sh @@ -20,7 +20,7 @@ SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source ${WORKSPACE}/test/csit/scripts/appc/script1.sh -export APPC_DOCKER_IMAGE_VERSION=1.3.0-SNAPSHOT-latest +export APPC_DOCKER_IMAGE_VERSION=1.4.0-SNAPSHOT-latest export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest export BRANCH=master export SOLUTION_NAME=onap diff --git a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh index 24de74099..61026d7b0 100644 --- a/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh +++ b/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh @@ -25,6 +25,9 @@ echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_container mkdir -p $WORKSPACE/externalapi-nbi cd $WORKSPACE/externalapi-nbi +# Create .env file to access env variables for docker-compose +echo "NEXUS_DOCKER_REPO=${NEXUS_DOCKER_REPO}" > .env + # Fetch the latest docker-compose.yml wget -O docker-compose.yml 'https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master' diff --git a/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml b/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml index b17b095c4..f6d5fcd08 100644 --- a/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml +++ b/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml @@ -161,9 +161,14 @@ aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/ten body: '' content_type: application/json status_code: 200 -aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne?depth=1: +aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne: + GET: + body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://multicloud-ocata:80/api/multicloud-titanium_cloud/v0/CloudOwner_RegionOne/identity/v2.0","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845276291"}' + content_type: application/json + status_code: 200 +aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/esr-system-info-list: GET: - body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://multicloud-ocata:80/api/multicloud-titanium_cloud/v0/CloudOwner_RegionOne/identity/v2.0","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845276291","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"4ce895ad-82f7-4476-b5eb-d19d19585da2","service-url":"http://keystone:8080/v3","user-name":"admin","password":"secret","system-type":"VIM","ssl-insecure":true,"cloud-domain":"Default","default-tenant":"admin","resource-version":"1524845155617"}]}}' + body: '{"esr-system-info":[{"esr-system-info-id":"4ce895ad-82f7-4476-b5eb-d19d19585da2","service-url":"http://keystone:8080/v3","user-name":"admin","password":"secret","system-type":"VIM","ssl-insecure":true,"cloud-domain":"Default","default-tenant":"admin","resource-version":"1524845155617"}]}' content_type: application/json status_code: 200 aai/v13/cloud-infrastructure/pservers/pserver/compute-0: diff --git a/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot b/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot index 7349f63bb..af77e8665 100644 --- a/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot +++ b/test/csit/tests/clamp/UIs/02__Create_TCA_model.robot @@ -70,7 +70,7 @@ Set TCA Box properties for TCAModel1 Click Element xpath=//*[@data-element-id="TCA_1d13unw"] Input Text xpath=(//input[@id='tname'])[2] text=TCA1 Select From List By Label xpath=//*[@id="tcaPol"] Policy2 - Select From List By Label xpath=//*[@id="eventName"] vCPEvGMUXPacketLoss + Select From List By Label xpath=//*[@id="eventName"] vLoadBalancer ### Cannot set all TCA box attributes due to element not interractable with Selenium # Select From List By Label xpath=//*[@id="controlLoopSchemaType"] VNF # Select From List By Index xpath=//*[@id="controlLoopSchemaType"] 1 diff --git a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot b/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot index a9cb78749..8bbf7c85e 100644 --- a/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot +++ b/test/csit/tests/clamp/UIs/03__Verify_UI_Models.robot @@ -21,7 +21,7 @@ Verify HolmesModel1 Should Contain Match ${resp} *migrate* Should Contain Match ${resp} *240* Should Contain Match ${resp} *390* - Should Contain Match ${resp} *correlational Logic1* + Should Contain Match ${resp} *Logic1* Should Contain Match ${resp} *config Policy Name1* Verify TCAModel1 diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index 16e147d20..fc59c48e8 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 192.168.1.51:5000 @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index bffbd2df2..cff445c93 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 10.145.122.118:5000 diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index 3b702c48e..a75438f7a 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 192.168.31.204:5000 @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} @@ -71,6 +71,7 @@ parameters: external_dns: 8.8.8.8 dns_forwarder: 204.178.3.230 oam_network_cidr: 10.0.0.0/16 + use_oam_net_for_robot: true ### Private IP addresses ### diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index da4b0e7e5..1dbcbc4f6 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -30,7 +30,7 @@ parameters: pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh - nexus_repo: https://nexus.onap.org/content/sites/raw + nexus_artifact_repo: https://nexus.onap.org nexus_docker_repo: 10.12.5.2:5000 @@ -40,7 +40,7 @@ parameters: dmaap_topic: AUTO - artifacts_version: 1.2.0-SNAPSHOT + artifacts_version: 1.2.1-SNAPSHOT openstack_tenant_id: ${OS_PROJECT_ID} diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index b580351dd..182e398ca 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -1,10 +1,11 @@ #!/bin/bash -x -if [ "$#" -ne 1 ]; then - echo "Usage: $0 <lab-name>" +if [ "$#" -lt 1 ]; then + echo "Usage: $0 <lab-name> [<demo repo directory>]" exit 1 fi + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi @@ -19,19 +20,24 @@ fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh +DEMO_DIR=${ONAP_WORKDIR}/demo +if [ "$#" -ge 2 ]; then + DEMO_DIR=$2 +fi + SENTINEL='Docker versions and branches' mkdir -p ${LAB_DIR}/target YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml ENV_FILE=${LAB_DIR}/target/onap_openstack.env -YAML_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -ENV_SRC=${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.env +YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml +ENV_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.env # copy heat template to WORKSPACE cp ${YAML_SRC} ${YAML_FILE} # generate final env file -pushd ${ONAP_WORKDIR}/demo +pushd ${DEMO_DIR} envsubst < ${LAB_DIR}/onap-openstack-template.env | sed -n "1,/${SENTINEL}/p" > ${ENV_FILE} echo " # Rest of the file was AUTO-GENERATED from" | tee -a ${ENV_FILE} echo " #" $(git config --get remote.origin.url) heat/ONAP/onap_openstack.env $(git rev-parse HEAD) | tee -a ${ENV_FILE} diff --git a/test/ete/scripts/run-healthcheck.sh b/test/ete/scripts/run-healthcheck.sh index e2ed3986f..e97ac3ff5 100755 --- a/test/ete/scripts/run-healthcheck.sh +++ b/test/ete/scripts/run-healthcheck.sh @@ -19,10 +19,12 @@ fi ssh-keygen -R ${ROBOT_IP} +set +x timeout 15m ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh RESULT=$? +set -x -LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1") +LOG_DIR=$(ssh -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | grep health | head -1") echo "Browse Robot results at http://${ROBOT_IP}:88/logs/${LOG_DIR}/" -rsync -e "ssh -i ${SSH_KEY}" -avPz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ +rsync -e "ssh -i ${SSH_KEY}" -avtz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/ exit $RESULT diff --git a/test/xtesting/robot/Dockerfile b/test/xtesting/robot/Dockerfile new file mode 100644 index 000000000..5d8d26ea2 --- /dev/null +++ b/test/xtesting/robot/Dockerfile @@ -0,0 +1,26 @@ +FROM opnfv/xtesting + +ARG OPENSTACK_TAG=stable/pike +ARG OPNFV_TAG=master +ARG ONAP_TAG=master + +ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/eteutils + +COPY thirdparty-requirements.txt thirdparty-requirements.txt +RUN apk --no-cache add --virtual .build-deps --update \ + python-dev build-base linux-headers libffi-dev \ + openssl-dev libjpeg-turbo-dev && \ + git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/OpenECOMP_ETE && \ + git clone --depth 1 https://git.onap.org/testsuite/properties -b $ONAP_TAG /share/config && \ + git clone --depth 1 https://git.onap.org/testsuite/python-testing-utils -b $ONAP_TAG /src/testing-utils && \ + pip install \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ + -rthirdparty-requirements.txt \ + -e /src/testing-utils && \ + rm -r thirdparty-requirements.txt /src/testing-utils/.git /share/config/.git \ + /var/opt/OpenECOMP_ETE/.git && \ + apk del .build-deps + +COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml +CMD ["run_tests", "-t", "all"] diff --git a/test/xtesting/robot/README.md b/test/xtesting/robot/README.md new file mode 100644 index 000000000..428cb3fa9 --- /dev/null +++ b/test/xtesting/robot/README.md @@ -0,0 +1,93 @@ +# Xtesting-onap-robot +Reuse of the Xtesting framework to onboard ONAP robot tests +It consists in 3 files: + * Dockerfile: create your dockerfile. For Beijing, it shall be generated manually. You can use a non official version [4] + * testcases.yaml: the list of the testcases based on robotframework tags as defined in ONAp repo [3] + * thirdparty-requirements.txt: dependencies needed by the Dockerfile + +## Configuration + +To launch Xtesting ONAP robot you need 2 files + * env + * onap.properties: list of ONAP endpoints (can be found on the robot VM). Depending from where you launch the tests, +please check that the IP addresses are reachable. + +As Xtesting supports both Openstack and Kubernetes, the env files shall be set accordingly. + +env file +``` +INSTALLER_TYPE=heat +DEPLOY_SCENARIO=os-nosdn-nofeature-ha +EXTERNAL_NETWORK=ext-network +NODE_NAME=pod4-orange-heat1 +TEST_DB_URL=hhttp://testresults.opnfv.org/onap/api/v1/results +BUILD_TAG=jenkins-functest-kolla-baremetal-daily-amsterdam-222 +``` + +All the values of the env file are not mandatory. + +### INSTALLER_TYPE +It indicates how you deploy your ONAP solution. The possible values are heat or oom. + +### DEPLOY_SCENARIO +If you do not precise DEPLOY_SCENARIO, it will be set to os-nosdn-nofeature-nohai by default, which means +Openstack / No Additional SDN controller / No Additional feature / no HA mode +This parameter can be useful if you manage several infrastructure and want to filter the results. +Other possible scenario: + * k8-nosdn-nofeature-ha (Kubernetes with no add-ons) + * os-odl-nofeature-ha (Openstack with Opendaylight SDN controller) + +### EXTERNAL_NETWORK (Openstack only) +You must precise it if it is not the first network with router:external=True + +### KUBERNETES_PROVIDER (Kubernetes only) +This parameter is set to local by default + +### KUBE_MASTER_URL (Kubernetes only) +You must indicate your Kubernetes Master URL. + +### KUBE_MASTER_IP (Kubernetes only) +You must indicate your Kubernetes Master IP. + +### NODE_NAME +The NODE_NAME is the name of the infrastructure that you declared in the Test DB. If you do not want to report the +results to the Test Database, you do not need to precise this parameter. + +### TEST_DB_URL +This parameter corresponds to the Test Database FQDN. +If you do not want to report the results to the Test Database, you do not need to precise this parameter. + +You can reference either your own local database or a public Database (You must be sure that your NODE_NAME has been declared on +this database). If so, and if you precise the flag to report the results, the test results will be automatically pushed. + +### BUILD_TAG +This parameter is used to retrieve the version (amsterdam in the example) for the publication in the test database. +If you do not publish the results, you can omit it. +It is based on an historical regex setup for OPNFV CI/CD chains. + +All the parameters are detailed in Functest user guide [1]. + +## onap.properties + +This file includes all the ONAP end points. It is built at ONAP installation and can be found on the ONAP Robot VM. + +# Launch xtesting-onap-robot + +You can run the test with the following command: + +sudo docker run --env-file <your env> -v <your onap properties>:/share/config/integration_vm_properties.py colvert22/functest-onap:latest + +By default it will execute all the tests corresponding to the command bash -c 'run_tests -t all' + +If you want to execute only a subset of the tests you may precise the test cases using -t: bash -c 'run_tests -t robot_dcae' + +The possible test cases are indictaed in the testcases.yaml and are based on robotframework tags. + +If you want to push the results to the database, you can use the -r option: bash -c 'run_tests -t all -r' + +# References + +* [1] Functest User Guide: http://docs.opnfv.org/en/latest/submodules/functest/docs/testing/user/userguide/index.html +* [2] Xtesting page: https://wiki.opnfv.org/display/functest/Xtesting +* [3] Onap robot repo: https://git.onap.org/testsuite/ +* [4] https://hub.docker.com/r/colvert22/xtesting-onap-robot/ diff --git a/test/xtesting/robot/testcases.yaml b/test/xtesting/robot/testcases.yaml new file mode 100644 index 000000000..484a7f011 --- /dev/null +++ b/test/xtesting/robot/testcases.yaml @@ -0,0 +1,127 @@ +--- +tiers: + - + name: onap + order: 1 + ci_loop: '(daily)|(weekly)' + description: >- + Set of basic Functional tests to validate the ONAP installation. + testcases: + - + case_name: robot_healthcheck + project_name: functest + criteria: 100 + blocking: true + description: >- + This test case verifies the basic ONAP API: appc, sdnc,so, + vid, ....based on the default robot tests + dependencies: + installer: '' + scenario: '' + run: + module: 'xtesting.core.robotframework' + class: 'RobotFramework' + args: + suites: + - /var/opt/OpenECOMP_ETE/robot/testsuites/health-check.robot + include: + - core + variablefile: + - '/share/config/integration_robot_properties.py' + - '/share/config/integration_vm_properties.py' + - '/share/config/integration_preload_parameters.py' + + - + case_name: robot_api + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies DCAE api + based on the default robot tests + dependencies: + installer: '' + scenario: '' + run: + module: 'xtesting.core.robotframework' + class: 'RobotFramework' + args: + suites: + - /var/opt/OpenECOMP_ETE/robot/testsuites/health-check.robot + include: + - api + variablefile: + - '/share/config/integration_robot_properties.py' + - '/share/config/integration_vm_properties.py' + - '/share/config/integration_preload_parameters.py' + + - + case_name: robot_dcae + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies DCAE api + based on the default robot tests + dependencies: + installer: '' + scenario: '' + run: + module: 'xtesting.core.robotframework' + class: 'RobotFramework' + args: + suites: + - /var/opt/OpenECOMP_ETE/robot/testsuites/health-check.robot + include: + - dcae + variablefile: + - '/share/config/integration_robot_properties.py' + - '/share/config/integration_vm_properties.py' + - '/share/config/integration_preload_parameters.py' + - + case_name: robot_multicloud + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies the multicloud features of ONAP + based on the default robot tests + dependencies: + installer: '' + scenario: '' + run: + module: 'xtesting.core.robotframework' + class: 'RobotFramework' + args: + suites: + - /var/opt/OpenECOMP_ETE/robot/testsuites/health-check.robot + include: + - multicloud + variablefile: + - '/share/config/integration_robot_properties.py' + - '/share/config/integration_vm_properties.py' + - '/share/config/integration_preload_parameters.py' + - + case_name: robot_3rdparty + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case verifies the ONAP 3rd party API + especially the different drivers + based on the default robot tests + dependencies: + installer: '' + scenario: '' + run: + module: 'xtesting.core.robotframework' + class: 'RobotFramework' + args: + suites: + - /var/opt/OpenECOMP_ETE/robot/testsuites/health-check.robot + include: + - 3rdparty + variablefile: + - '/share/config/integration_robot_properties.py' + - '/share/config/integration_vm_properties.py' + - '/share/config/integration_preload_parameters.py' diff --git a/test/xtesting/robot/thirdparty-requirements.txt b/test/xtesting/robot/thirdparty-requirements.txt new file mode 100644 index 000000000..f85db2d41 --- /dev/null +++ b/test/xtesting/robot/thirdparty-requirements.txt @@ -0,0 +1,15 @@ +selenium<=3.0.0 +requests==2.11.1 +robotframework-selenium2library==1.8.0 +robotframework-databaselibrary==0.8.1 +robotframework-extendedselenium2library==0.9.1 +robotframework-requests==0.4.5 +robotframework-sshlibrary==2.1.2 +robotframework-sudslibrary==0.8 +robotframework-ftplibrary==1.3 +robotframework-rammbock==0.4.0.1 +deepdiff==2.5.1 +dnspython==1.15.0 +robotframework-httplibrary==0.4.2 +robotframework-archivelibrary==0.3.2 +PyYAML==3.12 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 23fe56152..ababb1c75 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -11,8 +11,8 @@ onap/aaf/sms,latest onap/aaf/smsquorumclient,latest onap/aai-resources,1.2-STAGING-latest onap/aai-traversal,1.2-STAGING-latest -onap/aai/esr-gui,1.1.0-SNAPSHOT -onap/aai/esr-server,1.1.0-SNAPSHOT +onap/aai/esr-gui,latest +onap/aai/esr-server,latest onap/admportal-sdnc-image,1.3-STAGING-latest onap/appc-cdt-image,1.3.0-SNAPSHOT-latest onap/appc-image,1.3.0-SNAPSHOT-latest @@ -49,7 +49,7 @@ onap/org.onap.dcaegen2.collectors.snmptrap,latest onap/org.onap.dcaegen2.collectors.ves.vescollector,latest onap/org.onap.dcaegen2.deployments.bootstrap,1.1.2 onap/org.onap.dcaegen2.deployments.cm-container,latest -onap/org.onap.dcaegen2.deployments.healthcheck-container,1.0.0 +onap/org.onap.dcaegen2.deployments.healthcheck-container,latest onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,latest onap/org.onap.dcaegen2.deployments.redis-cluster-container,latest onap/org.onap.dcaegen2.deployments.tca-cdap-container,latest @@ -61,8 +61,8 @@ onap/org.onap.dcaegen2.platform.policy-handler,latest onap/org.onap.dcaegen2.platform.servicechange-handler,latest onap/org.onap.dcaegen2.services.heartbeat,latest onap/org.onap.dcaegen2.services.prh.prh-app-server,latest -onap/policy-drools,1.2.0 -onap/policy-pe,1.2.0 +onap/policy-drools,1.2.2 +onap/policy-pe,1.2.2 onap/portal-app,v2.2.0 onap/portal-db,v2.2.0 onap/portal-sdk,v2.2.0 @@ -80,8 +80,9 @@ onap/sdnc-dmaap-listener-image,1.3-STAGING-latest onap/sdnc-image,1.3-STAGING-latest onap/sdnc-ueb-listener-image,1.3-STAGING-latest onap/search-data-service,1.2-STAGING-latest +onap/sniroemulator,latest onap/sparky-be,1.2-STAGING-latest -onap/testsuite,1.2-STAGING-latest +onap/testsuite,1.2.0 onap/usecase-ui,latest onap/usecase-ui/usecase-ui-server,latest onap/vfc/catalog,1.1.0-STAGING-latest @@ -103,6 +104,6 @@ onap/vfc/ztesdncdriver,1.1.0-STAGING-latest onap/vfc/ztevmanagerdriver,1.0.3-STAGING-latest onap/vfc/ztevnfmdriver,1.1.0-STAGING-latest onap/vid,1.2.1 -onap/vnfsdk/refrepo,1.1-STAGING-latest -onap/vnfsdk/refrepo/postgres,latest +onap/vnfsdk/refrepo,1.1.1 +onap/vnfsdk/refrepo/postgres,1.1.1 openecomp/mso,1.2.1 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index f0acf3cda..598c4cb85 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -22,15 +22,17 @@ org.onap.aaf.authz,aaf-misc-env,2.1.0 org.onap.aaf.authz,aaf-misc-log4j,2.1.0 org.onap.aaf.authz,aaf-misc-rosetta,2.1.0 org.onap.aaf.authz,aaf-misc-xgen,2.1.0 -org.onap.aai,rest-client,1.2.0 +org.onap.aai,rest-client,1.2.1 org.onap.aai,search-data-service,1.2.0 -org.onap.aai.aai-common,aai-annotations,1.2.1 -org.onap.aai.aai-common,aai-auth,1.2.1 -org.onap.aai.aai-common,aai-common,1.2.1 -org.onap.aai.aai-common,aai-core,1.2.1 -org.onap.aai.aai-common,aai-schema,1.2.1 -org.onap.aai.aai-common,aai-utils,1.2.1 -org.onap.aai.data-router,data-router,1.2.0 +org.onap.aai.aai-common,aai-annotations,1.2.4 +org.onap.aai.aai-common,aai-auth,1.2.4 +org.onap.aai.aai-common,aai-common,1.2.4 +org.onap.aai.aai-common,aai-core,1.2.4 +org.onap.aai.aai-common,aai-schema,1.2.4 +org.onap.aai.aai-common,aai-utils,1.2.4 +org.onap.aai.babel,babel,1.2.0 +org.onap.aai.champ,champ,1.2.2 +org.onap.aai.data-router,data-router,1.2.1 org.onap.aai.esr-gui,aai-esr-gui,1.0.0 org.onap.aai.esr-gui,common,1.0.0 org.onap.aai.esr-gui,distribution,1.0.0 @@ -39,20 +41,20 @@ org.onap.aai.esr-gui,portal,1.0.0 org.onap.aai.esr-server,aai-esr-server,1.0.0 org.onap.aai.esr-server,esr-manager,1.0.0 org.onap.aai.esr-server,standalone,1.0.0 -org.onap.aai.event-client,event-client,1.2.0 -org.onap.aai.event-client,event-client-api,1.2.0 -org.onap.aai.event-client,event-client-dmaap,1.2.0 -org.onap.aai.event-client,event-client-kafka,1.2.0 -org.onap.aai.logging-service,common-logging,1.2.0 -org.onap.aai.logging-service,eelf-logging,1.2.0 -org.onap.aai.logging-service,logging-api,1.2.0 -org.onap.aai.logging-service,logging-service,1.2.0 +org.onap.aai.event-client,event-client,1.2.2 +org.onap.aai.event-client,event-client-api,1.2.2 +org.onap.aai.event-client,event-client-dmaap,1.2.2 +org.onap.aai.event-client,event-client-kafka,1.2.2 +org.onap.aai.logging-service,common-logging,1.2.2 +org.onap.aai.logging-service,eelf-logging,1.2.2 +org.onap.aai.logging-service,logging-api,1.2.2 +org.onap.aai.logging-service,logging-service,1.2.2 org.onap.aai.model-loader,model-loader,1.2.0 org.onap.aai.resources,aai-resources,1.2.0 org.onap.aai.resources,resources,1.2.0 -org.onap.aai.router-core,router-core,1.2.0 +org.onap.aai.router-core,router-core,1.2.1 org.onap.aai.sparky-be,sparky-be,1.2.0 -org.onap.aai.sparky-fe,sparky-fe,1.2.0 +org.onap.aai.sparky-fe,sparky-fe,1.2.1 org.onap.aai.traversal,aai-traversal,1.2.0 org.onap.aai.traversal,traversal,1.2.0 org.onap.ccsdk.parent,binding-parent,1.0.1 @@ -86,17 +88,17 @@ org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.1 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 org.onap.clamp.clds.clamp,clamp,2.0.0 -org.onap.cli,cli-framework,1.1.0 -org.onap.cli,cli-main,1.1.0 -org.onap.cli,cli-plugins-aai,1.1.0 -org.onap.cli,cli-plugins-msb,1.1.0 -org.onap.cli,cli-plugins-sample,1.1.0 -org.onap.cli,cli-plugins-sdc,1.1.0 -org.onap.cli,cli-plugins-so,1.1.0 -org.onap.cli,cli-sample-mock-generator,1.1.0 -org.onap.cli,cli-sample-yaml-generator,1.1.0 -org.onap.cli,cli-validation,1.1.0 -org.onap.cli,cli-zip,1.1.0 +org.onap.cli,cli-framework,2.0.0 +org.onap.cli,cli-main,2.0.0 +org.onap.cli,cli-plugins-aai,2.0.0 +org.onap.cli,cli-plugins-msb,2.0.0 +org.onap.cli,cli-plugins-sample,2.0.0 +org.onap.cli,cli-plugins-sdc,2.0.0 +org.onap.cli,cli-plugins-so,2.0.0 +org.onap.cli,cli-sample-mock-generator,2.0.0 +org.onap.cli,cli-sample-yaml-generator,2.0.0 +org.onap.cli,cli-validation,2.0.0 +org.onap.cli,cli-zip,2.0.0 org.onap.dcaegen2,dcaegen2,1.1.0 org.onap.dcaegen2.analytics.tca,dcae-analytics,2.2.0 org.onap.dcaegen2.analytics.tca,dcae-analytics-aai,2.2.0 @@ -137,10 +139,10 @@ org.onap.multicloud.openstack,windriver,1.0.0 org.onap.multicloud.openstack.vmware,vesagent,1.0.0 org.onap.multicloud.openstack.vmware,vio,1.0.0 org.onap.oparent,oparent,1.1.1 -org.onap.policy.common,common-modules,1.2.0 -org.onap.policy.drools-applications,drools-pdp-apps,1.2.0 -org.onap.policy.drools-pdp,drools-pdp,1.2.0 -org.onap.policy.engine,PolicyEngineSuite,1.2.0 +org.onap.policy.common,common-modules,1.2.2 +org.onap.policy.drools-applications,drools-pdp-apps,1.2.2 +org.onap.policy.drools-pdp,drools-pdp,1.2.2 +org.onap.policy.engine,PolicyEngineSuite,1.2.2 org.onap.portal.sdk,epsdk-analytics,2.2.0 org.onap.portal.sdk,epsdk-app-common,2.2.0 org.onap.portal.sdk,epsdk-app-overlay,2.2.0 @@ -167,11 +169,11 @@ org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.0.2 org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.0.0 org.onap.vfc.nfvo.wfengine,activiti-extension,1.0.0 org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.0.0 -org.onap.vnfsdk.refrepo,vnf-sdk-marketplace,1.1.0 -org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.1.0 -org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.1.0 -org.onap.vnfsdk.refrepo,vnfmarket,1.1.0 -org.onap.vnfsdk.refrepo,vnfmarket-deployment,1.1.0 +org.onap.vnfsdk.refrepo,vnf-sdk-marketplace,1.1.2 +org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.1.1 +org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.1.2 +org.onap.vnfsdk.refrepo,vnfmarket,1.1.1 +org.onap.vnfsdk.refrepo,vnfmarket-deployment,1.1.2 org.onap.vnfsdk.validation,csarvalidation-deployment,1.1.1 org.onap.vnfsdk.validation,validation,1.1.2 org.onap.vnfsdk.validation,validation-csar,1.1.2 diff --git a/version-manifest/src/main/scripts/update-oom-image-versions.sh b/version-manifest/src/main/scripts/update-oom-image-versions.sh index 1a82b490d..6342857c7 100755 --- a/version-manifest/src/main/scripts/update-oom-image-versions.sh +++ b/version-manifest/src/main/scripts/update-oom-image-versions.sh @@ -19,6 +19,6 @@ cd $OOM_DIR/kubernetes for line in $(tail -n +2 $MANIFEST); do image=$(echo $line | cut -d , -f 1) tag=$(echo $line | cut -s -d , -f 2) - perl -p -i -e "s|image: $image(:.*$\|$)|image: $image:$tag|g" $(find ./ -name values.yaml) + perl -p -i -e "s|$image(:.*$\|$)|$image:$tag|g" $(find ./ -name values.yaml) done |