SDV: Reorganize subprojects

This patch reorganizes the subprojects.
Pylint Fixes. Additional Configurations

Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Change-Id: I021f33f035d7b2dcfded230ca40337afdac183e8

10 files changed, 121 insertions, 40 deletions

diff --git a/sdv/conf/00_common.conf b/sdv/conf/00_common.conf
index 5326ecb..f5e8a23 100644
--- a/sdv/conf/00_common.conf
+++ b/sdv/conf/00_common.conf
@@ -8,9 +8,12 @@ LOG_FILE_DEFAULT = 'valid-overall.log'
 
 ROOT_DIR = os.path.normpath(os.path.join(
     os.path.dirname(os.path.realpath(__file__)), '../'))
-SW_PRE_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePreValid')
-SW_POST_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePostValid')
+SW_PRE_URLS_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePreUrlsValid')
+SW_PRE_CONFIG_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePreConfigValid')
+SW_POST_STATE_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePostStateValid')
+SW_POST_SECURITY_VALID_DIR = os.path.join(ROOT_DIR, 'SoftwarePostSecurityValid')
 NW_LINKS_VALID_DIR = os.path.join(ROOT_DIR, 'NwLinksValid')
+RES_MOD_VALID_DIR = os.path.join(ROOT_DIR, 'ResourceModelValid')
 
 # 'debug', 'info', 'warning', 'error', 'critical'
 VERBOSITY = 'warning'
diff --git a/sdv/conf/01_swpreurlsvalid.conf b/sdv/conf/01_swpreurlsvalid.conf
new file mode 100644
index 0000000..ddce229
--- /dev/null
+++ b/sdv/conf/01_swpreurlsvalid.conf
@@ -0,0 +1,24 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+
+# Modify this value to any Installer projects that have
+# manifests (templates and configuration files)
+SW_PRE_URLS_VALIDATOR = 'Airship'
+
+# Airship Specific configurations.
+AIRSHIP_MANIFEST_URL = 'https://gerrit.opnfv.org/gerrit/airship'
+AIRSHIP_MANIFEST_BRANCH = 'master'
+AIRSHIP_MANIFEST_DOWNLOAD_PATH = '/tmp'
+AIRSHIP_MANIFEST_SITE_NAME = 'intel-pod10'
+AIRSHIP_TREASUREMAP_VERSION = 'v1.7'
diff --git a/sdv/conf/01_swprevalid.conf b/sdv/conf/01_swprevalid.conf
deleted file mode 100644
index 46043ce..0000000
--- a/sdv/conf/01_swprevalid.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-
-# Modify this value to any Installer projects that have
-# manifests (templates and configuration files)
-SW_PRE_VALIDATOR = 'Airship'
-
-# Mandatory Requirements [ Configuration Check ]
-OPENSTACK_VERSION = 'ocata'
-OPERATING_SYSTEM = 'centos'
-OS_VERSION_NAME = 'xenial'
-HUGEPAGES_SIZE = '1G'
-HUGEPAGES_COUNT = 32
-OPENSTACK_CUSTOM_SERVICE_LIST = ['barbican', 'sahara']
-VIRTUAL_SWITCH_COMPUTE = 'ovs'
-VIRTUAL_SWITCH_VERSION = '2.9.2'
-BOOTSTRAP_PROTOCOL = 'pxe'
-CPU_ISOLATION = '2-19,22-39'
-
-# Airship Specific configurations.
-AIRSHIP_MANIFEST_URL = 'https://gerrit.opnfv.org/gerrit/airship'
-AIRSHIP_MANIFEST_BRANCH = 'master'
-AIRSHIP_MANIFEST_DOWNLOAD_PATH = '/tmp'
-AIRSHIP_MANIFEST_SITE_NAME = 'intel-pod10'
-AIRSHIP_TREASUREMAP_VERSION = 'v1.7'
-
-
-# Optional Requirements [Could be Installer Specific ]
-OVS_DPDK_ARGUMENTS = 'test'
-OVERCLOUD_LOGGING_CLIENT = 'fluentd'
-OVERCLOUD_MONITORING_CLIENT = 'collectd'
-LMA_SERVER_MONITORING = 'prometheus'
-LMA_SERVER_LOGGING = 'efk'
-OPENSTACK_CONTAINER_ORCHESTRATION = 'kubernetes'
-AIRSHIP_MANIFEST_VERSION = 1.7
diff --git a/sdv/conf/02_swpostvalid.conf b/sdv/conf/02_swpostvalid.conf
deleted file mode 100644
index 1ed9279..0000000
--- a/sdv/conf/02_swpostvalid.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# Modify this value to any Installer projects that have
-# manifests (templates and configuration files)
-SW_POST_VALIDATOR = 'Airship'
diff --git a/sdv/conf/02_swpreconfigvalid.conf b/sdv/conf/02_swpreconfigvalid.conf
new file mode 100644
index 0000000..bbadfcc
--- /dev/null
+++ b/sdv/conf/02_swpreconfigvalid.conf
@@ -0,0 +1,20 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+
+SW_PRE_CONFIG_VALIDATOR = 'ConfVal'
+MANIFEST_URL = ""
+MANIFEST_DIR = ""
+PDF_FILE_URL = ""
+PDF_FILE_PATH = ""
+INSTALLER = "Airship"
diff --git a/sdv/conf/03_nwlinksvalid.conf b/sdv/conf/03_nwlinksvalid.conf
deleted file mode 100644
index 6e83066..0000000
--- a/sdv/conf/03_nwlinksvalid.conf
+++ /dev/null
@@ -1 +0,0 @@
-NW_LINKS_VALIDATOR = 'lldpd'
diff --git a/sdv/conf/03_swpoststatevalid.conf b/sdv/conf/03_swpoststatevalid.conf
new file mode 100644
index 0000000..c98ed98
--- /dev/null
+++ b/sdv/conf/03_swpoststatevalid.conf
@@ -0,0 +1,26 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+
+SW_POST_STATE_VALIDATOR = 'Airship'
+
+# For the K8S based deployment Type
+CLUSTER_INFO_FILE_PATH = ""
+CLUSTER_ACCESS_FILE_PATH = ""
+
+# For Containers-without K8S and VMs based Deployment.
+OVERCLOUD_INFO_FILE_PATH = ""
+OVERCLOUD_ACCESS_FILE_PATH = ""
+
+# Any validation specific information is added in this file.
+VALIDATION_CONFIG_FILE_PATH = ""
diff --git a/sdv/conf/04_swpostsecurityvalid.conf b/sdv/conf/04_swpostsecurityvalid.conf
new file mode 100644
index 0000000..5482612
--- /dev/null
+++ b/sdv/conf/04_swpostsecurityvalid.conf
@@ -0,0 +1,16 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+#
+
+SW_POST_SECURITY_VALIDATOR = 'Airship'
diff --git a/sdv/conf/05_nwlinksvalid.conf b/sdv/conf/05_nwlinksvalid.conf
new file mode 100644
index 0000000..755e623
--- /dev/null
+++ b/sdv/conf/05_nwlinksvalid.conf
@@ -0,0 +1,15 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+
+NW_LINKS_VALIDATOR = 'lldpd'
diff --git a/sdv/conf/06_resmodvalid.conf b/sdv/conf/06_resmodvalid.conf
new file mode 100644
index 0000000..9a1a110
--- /dev/null
+++ b/sdv/conf/06_resmodvalid.conf
@@ -0,0 +1,15 @@
+# Copyright 2020 Spirent Communications.
+#
+# 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.
+
+RES_MOD_VALIDATOR = 'custom'