From 89c5524b9aaf7a098e08385573fa1d2332585acf Mon Sep 17 00:00:00 2001
From: blsaws <bryan.sullivan@att.com>
Date: Fri, 1 Apr 2016 16:39:33 -0700
Subject: Remove old scripts merged into one.

JIRA: COPPER-4

Change-Id: Ie3bc9def0430d8153ca95bb714c333740ed0f7fd
Signed-off-by: blsaws <bryan.sullivan@att.com>
(cherry picked from commit b9dcf51bf38ff4e178408dff3a3e41694792901c)
---
 tests/adhoc/dmz01_1.sh | 62 --------------------------------------
 tests/adhoc/dmz01_2.sh | 81 --------------------------------------------------
 2 files changed, 143 deletions(-)
 delete mode 100644 tests/adhoc/dmz01_1.sh
 delete mode 100644 tests/adhoc/dmz01_2.sh

diff --git a/tests/adhoc/dmz01_1.sh b/tests/adhoc/dmz01_1.sh
deleted file mode 100644
index 0d6ca7e..0000000
--- a/tests/adhoc/dmz01_1.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# Copyright 2015-2016 AT&T Intellectual Property, Inc
-#  
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#  
-# http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# What this is: An OpenStack Congress policy test. Sets up and validates policy
-# creation and execution for:
-# 1) Identifying VMs connected to a DMZ (currently identified through a 
-#    specifically-named security group)
-# 2) Identifying VMs connected per (1), which are by policy not allowed to be
-#    (currently implemented through an image tag intended to identify images
-#    that are "authorized" i.e. tested and secure, to be DMZ-connected) 
-#
-# Status: this is a work in progress, under test. Test (1) has been verified, 
-# Test (2) is still in development.
-#
-# How to use:
-#   Install test server per https://wiki.opnfv.org/copper/academy/congress/test
-#   # Create Congress policy
-#   $ source ~/git/copper/tests/adhoc/dmz01_1.sh
-#   # Create VMs etc that exercise policy
-#   $ source ~/git/copper/tests/adhoc/dmz01_2.sh
-#   After test, cleanup with (not yet implemented)
-#   $ source ~/git/copper/tests/adhoc/dmz01-clean.sh
-
-set -x #echo on
-
-source ~/admin-openrc.sh <<EOF
-openstack
-EOF
-
-openstack congress policy create test
-
-openstack congress policy rule create test "dmz_server(x) :- nova:servers(id=x,status='ACTIVE'), neutronv2:ports(id, device_id, status='ACTIVE'),  neutronv2:security_group_port_bindings(pid, sg), neutronv2:security_groups(sg,name='dmz')" --name dmz_server
-
-openstack congress policy rule create test "cirros(x) :- nova:servers(id=x,image,status='ACTIVE'), glance:images(image,name='cirros')" --name cirros_server
-
-# currently failing "Rule already exists::An unknown exception occurred. (HTTP 409)..."
-# openstack congress policy rule create test "dmz_placement_error(id) :- nova:servers(id,name,hostId,status,tenant_id,user_id,image,flavor,OS1,OS2), not glance:images(image,status,gname,container_format,created_at,updated,disk_format,owner,protected,min_ram,min_disk,checksum,size,file,kernel_id,ramdisk_id,ramdisk_id,schema,visibility,tags='dmz'), dmz_server(x)" --name dmz_placement_error
-
-# validated rules created during test development
-# openstack congress policy rule create test "active_servers(x) :- nova:servers(id=x, status='ACTIVE')" --name active_servers
-# openstack congress policy rule create test "dmz_port(id) :- neutronv2:security_group_port_bindings(id,sg), neutronv2:security_groups(sg,name='dmz')" --name dmz_port
-#
-# rules under test
-# openstack congress policy rule create test "cirros(x) :- glance:images(id=x,name='cirros-0.3.3-x86_64')" --name cirros
-# openstack congress policy rule create test "image_notags(x) :- glance:images(id=x,tags='')" --name image_notags
-# to remove a policy rule
-# openstack congress policy rule delete test nondmz_image
-
-set +x #echo off
diff --git a/tests/adhoc/dmz01_2.sh b/tests/adhoc/dmz01_2.sh
deleted file mode 100644
index a10b6e0..0000000
--- a/tests/adhoc/dmz01_2.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-# Copyright 2015-2016 AT&T Intellectual Property, Inc
-#  
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#  
-# http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# What this is: An OpenStack Congress policy test. Sets up and validates policy
-# creation and execution for:
-# 1) Identifying VMs connected to a DMZ (currently identified through a 
-#    specifically-named security group)
-# 2) Identifying VMs connected per (1), which are by policy not allowed to be
-#    (currently implemented through an image tag intended to identify images
-#    that are "authorized" i.e. tested and secure, to be DMZ-connected) 
-#
-# Status: this is a work in progress, under test. Test (1) has been verified, 
-# Test (2) is still in development.
-#
-# How to use:
-#   Install test server per https://wiki.opnfv.org/copper/academy/congress/test
-#   # Create Congress policy
-#   $ source ~/git/copper/tests/adhoc/dmz01_1.sh
-#   # Create VMs etc that exercise policy
-#   $ source ~/git/copper/tests/adhoc/dmz01_2.sh
-#   After test, cleanup with (not yet implemented)
-#   $ source ~/git/copper/tests/adhoc/dmz01-clean.sh
-
-set -x #echo on
-
-source ~/admin-openrc.sh <<EOF
-openstack
-EOF
-
-image=$(openstack image list | awk "/ cirros-0.3.3-x86_64 / { print \$2 }")
-if [ "$image" == "" ]; then glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64 --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare
-fi
-
-image=$(openstack image list | awk "/ cirros-0.3.3-x86_64-dmz / { print \$2 }")
-if [ "$image" == "" ]; then glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64-dmz --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare
-fi
-
-IMAGE_ID=$(glance image-list | awk "/ cirros-0.3.3-x86_64-dmz / { print \$2 }")
-
-glance --os-image-api-version 2 image-tag-update $IMAGE_ID "dmz"
-
-neutron net-create test_public --router:external=true --provider:network_type=flat --provider:physical_network=physnet1
-
-neutron subnet-create --disable-dhcp test_public 192.168.10.0/24
-
-neutron net-create test_internal
-
-neutron subnet-create test_internal 10.0.0.0/24 --name test_internal --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8
-
-neutron router-create test_router
-
-neutron router-gateway-set test_router test_public
-
-neutron router-interface-add test_router subnet=test_internal
-# add a delay since the previous command takes the neutron-api offline for a while (?)
-sleep 30
-
-test_internal_NET=$(neutron net-list | awk "/ test_internal / { print \$2 }")
-
-neutron security-group-create dmz
-
-neutron security-group-rule-create --direction ingress  dmz
-
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET --security-groups dmz cirros1
-
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64-dmz --nic net-id=$test_internal_NET  --security-groups dmz cirros2
-
-set +x #echo off
-- 
cgit 1.2.3-korg