From c9f506eee1a3e38b589e586b3200942886afdbea Mon Sep 17 00:00:00 2001
From: "Huang, Sophie (sh879n)" <sh879n@att.com>
Date: Mon, 7 Oct 2019 17:05:58 -0500
Subject: [PATCH] Tools: Update test-networkpolicy.sh

This patch set adds ingress network policy testcases for mariadb
in openstack namespace.

Depends-On: https://review.opendev.org/#/c/687162/
Change-Id: Ia2bc596baf623ef3f747fbd0534c8e058e1571f8
---
 tools/deployment/common/test-networkpolicy.sh | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tools/deployment/common/test-networkpolicy.sh b/tools/deployment/common/test-networkpolicy.sh
index 2b667a09b7..15a3b9f537 100755
--- a/tools/deployment/common/test-networkpolicy.sh
+++ b/tools/deployment/common/test-networkpolicy.sh
@@ -42,14 +42,24 @@ function test_netpol {
 # Doing negative tests
 #test_netpol openstack mariadb server rabbitmq.openstack.svc.cluster.local:5672 fail
 #test_netpol openstack rabbitmq-rabbitmq server memcached.openstack.svc.cluster.local:11211 fail
-#test_netpol openstack memcached server mariadb.openstack.svc.cluster.local:3306 fail
+
+# Negative Keystone tests
 test_netpol openstack mariadb server keystone-api.openstack.svc.cluster.local:5000 fail
 test_netpol openstack mariadb ingress keystone-api.openstack.svc.cluster.local:5000 fail
 test_netpol openstack memcached server keystone-api.openstack.svc.cluster.local:5000 fail
 test_netpol openstack rabbitmq server keystone-api.openstack.svc.cluster.local:5000 fail
 
+# Negative Mariadb tests
+test_netpol openstack memcached server mariadb.openstack.svc.cluster.local:3306 fail
+test_netpol openstack ingress server mariadb-server.openstack.svc.cluster.local:3306 fail
+
 # Doing positive tests
+
+# Positive Mariadb tests
 test_netpol openstack keystone api mariadb.openstack.svc.cluster.local:3306 success
+test_netpol openstack keystone api mariadb-server.openstack.svc.cluster.local:3306 success
+test_netpol openstack mariadb ingress mariadb-server.openstack.svc.cluster.local:3306 success
+
 test_netpol openstack keystone api rabbitmq.openstack.svc.cluster.local:5672 success
 test_netpol openstack ingress server keystone-api.openstack.svc.cluster.local:5000 success
 test_netpol openstack prometheus-openstack-exporter exporter keystone-api.openstack.svc.cluster.local:5000 success
@@ -64,7 +74,13 @@ if kubectl -n openstack get pod -l application=cinder | grep Running ; then
   test_netpol openstack cinder api horizon.openstack.svc.cluster.local:80 fail
 # Positive Cinder Tests
   test_netpol openstack cinder api rabbitmq.openstack.svc.cluster.local:5672 success
+
+  # Positive Keystone test
   test_netpol openstack cinder api keystone-api.openstack.svc.cluster.local:5000 success
+
+  # Positive Mariadb tests
+  test_netpol openstack cinder api mariadb.openstack.svc.cluster.local:3306 success
+  test_netpol openstack cinder api mariadb-server.openstack.svc.cluster.local:3306 success
 else
 # Negative Compute-Kit Tests
   #test_netpol openstack keystone api heat-api.openstack.svc.cluster.local fail
@@ -78,8 +94,13 @@ else
   test_netpol openstack openvswitch openvswitch-vswitchd memcached.openstack.svc.cluster.local:11211 fail
   test_netpol openstack libvirt libvirt memcached.openstack.svc.cluster.local:11211 fail
 # Positive Compute-Kit Tests
+
+  # Positive Mariadb tests
   test_netpol openstack heat api mariadb.openstack.svc.cluster.local:3306 success
   test_netpol openstack glance api mariadb.openstack.svc.cluster.local:3306 success
+  test_netpol openstack glance api mariadb-server.openstack.svc.cluster.local:3306 success
+
+  # Positive Keystone tests
   test_netpol openstack heat api keystone-api.openstack.svc.cluster.local:5000 success
   test_netpol openstack glance api keystone-api.openstack.svc.cluster.local:5000 success
   test_netpol openstack horizon server keystone-api.openstack.svc.cluster.local:5000 success