From c04ffff59b770ae32c4691bdc3d3b4363604db78 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 7 Feb 2017 07:23:46 -0800 Subject: Update prerequisite comments. Change-Id: Iaf091e2ce398ce57b9ca3deb7726e57ae69a9731 Signed-off-by: bryan --- tests/dmz-clean.sh | 5 +++-- tests/dmz.sh | 5 +++-- tests/get_external_net.sh | 5 +++-- tests/network_bridging-clean.sh | 7 +++---- tests/network_bridging.sh | 5 ++--- tests/reserved_subnet-clean.sh | 7 ++++--- tests/reserved_subnet.sh | 7 ++++--- tests/run.sh | 7 ++++--- tests/smtp_ingress-clean.sh | 7 ++++--- tests/smtp_ingress.sh | 9 ++++----- 10 files changed, 34 insertions(+), 30 deletions(-) diff --git a/tests/dmz-clean.sh b/tests/dmz-clean.sh index dcb53b8..b13ef7e 100644 --- a/tests/dmz-clean.sh +++ b/tests/dmz-clean.sh @@ -18,8 +18,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # Install Congress test server per https://wiki.opnfv.org/copper/academy # # Create Congress policy and resources that exercise policy diff --git a/tests/dmz.sh b/tests/dmz.sh index 1e70bae..e95a7ea 100644 --- a/tests/dmz.sh +++ b/tests/dmz.sh @@ -26,8 +26,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # # Create Congress policy and resources that exercise policy # $ bash dmz.sh diff --git a/tests/get_external_net.sh b/tests/get_external_net.sh index 10099ac..e7db4e1 100644 --- a/tests/get_external_net.sh +++ b/tests/get_external_net.sh @@ -19,8 +19,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # source get_external_net # (sets two shell variables: EXTERNAL_NETWORK_NAME and EXTERNAL_SUBNET_ID) diff --git a/tests/network_bridging-clean.sh b/tests/network_bridging-clean.sh index 02db216..a9bd909 100644 --- a/tests/network_bridging-clean.sh +++ b/tests/network_bridging-clean.sh @@ -18,10 +18,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: -# - OpenStack Congress installed as part of an OpenStack deployment, -# e.g. via Devstack, or OPFNV -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # $ bash network_bridging-clean.sh diff --git a/tests/network_bridging.sh b/tests/network_bridging.sh index 5b36743..7edd8f9 100644 --- a/tests/network_bridging.sh +++ b/tests/network_bridging.sh @@ -28,9 +28,8 @@ # Status: this is a work in progress, under test. # # Prerequisite: -# - OpenStack Congress installed as part of an OpenStack deployment, -# e.g. via Devstack or OPFNV -# - OpenStack CLI environment variables setup +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # # Create Congress policy and resources that exercise policy # $ bash network_bridging.sh diff --git a/tests/reserved_subnet-clean.sh b/tests/reserved_subnet-clean.sh index f502ee4..abc4e7e 100644 --- a/tests/reserved_subnet-clean.sh +++ b/tests/reserved_subnet-clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc +# Copyright 2015-2017 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. @@ -21,8 +21,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # # Create Congress policy and resources that exercise policy # $ bash reserved_subnet.sh diff --git a/tests/reserved_subnet.sh b/tests/reserved_subnet.sh index 3718c94..1d68b17 100644 --- a/tests/reserved_subnet.sh +++ b/tests/reserved_subnet.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc +# Copyright 2015-2017 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. @@ -21,8 +21,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # # Create Congress policy and resources that exercise policy # $ bash reserved_subnet.sh diff --git a/tests/run.sh b/tests/run.sh index 333779e..24f2e53 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc +# Copyright 2015-2017 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. @@ -15,8 +15,9 @@ # # What this is: function test driver for the OPNFV Copper project. # Status: this is a work in progress, under test. -# Prequisite: -# - OPFNV installed per JOID or Apex installer +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # On jumphost: # - Congress installed through OPNFV installer or install_congress_1.sh # - OpenStack CLI clients installed diff --git a/tests/smtp_ingress-clean.sh b/tests/smtp_ingress-clean.sh index 42e6042..0cf7943 100644 --- a/tests/smtp_ingress-clean.sh +++ b/tests/smtp_ingress-clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc +# Copyright 2015-2017 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. @@ -18,8 +18,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: OPFNV installed per JOID or Apex installer -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # How to use: # # Create Congress policy and resources that exercise policy # $ bash dmz.sh diff --git a/tests/smtp_ingress.sh b/tests/smtp_ingress.sh index 7a7d828..a6ee632 100644 --- a/tests/smtp_ingress.sh +++ b/tests/smtp_ingress.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016 AT&T Intellectual Property, Inc +# Copyright 2015-2017 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. @@ -20,10 +20,9 @@ # # Status: this is a work in progress, under test. # -# Prequisite: -# - OpenStack Congress installed as part of an OpenStack deployment, -# e.g. via Devstack or OPFNV -# - OpenStack CLI environment variables setup +# Prerequisite: +# - OpenStack deployment with Congress service activated. +# - OpenStack CLI environment variables setup e.g. via admin-openrc.sh script. # # How to use: # $ bash smtp_ingress.sh -- cgit 1.2.3-korg