Corrected Nexus Package content

Before dockerzation can proceed, contents of
the package must be correct. Few folders/files were missing.
Changed assembly.xml to include all but the ones that are
not needed.

Also, removed files from conductor/conductor folder that were
thought to have contributed to the correction of the package
initially.

conductor/conductor/README.rst
conductor/conductor/README.md
conductor/conductor/setup.py
conductor/conductor/setup.cfg

These files are actually not needed in that level
of folder (conductor/condcutor) - They should exist only on the
main conductor/ folder.

Issue-ID: OPTFRA-123
Change-Id: I006694ddc8e7e5de21ad17fb0d4720c5b19dc960
Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>

9 files changed, 54 insertions, 201 deletions

diff --git a/build-dockers.sh b/build-dockers.sh
index 37698c8..6814e3e 100755
--- a/build-dockers.sh
+++ b/build-dockers.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# TODO (IKRAM): need to test api only first to test the docker upload chain. 
+# TODO (IKRAM): need to test api only first to test the docker upload chain.
 # Will enable the others once api is tested
 docker build -t api conductor/docker/api/
 docker build -t controller conductor/docker/controller/
diff --git a/conductor/assembly.xml b/conductor/assembly.xml
index b190852..f1ce62d 100644
--- a/conductor/assembly.xml
+++ b/conductor/assembly.xml
@@ -20,16 +20,17 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>LICENSE</include>
-                <include>README.rst</include>
-                <include>conductor/**</include>
-                <include>doc/**</include>
-                <include>etc/**</include>
-                <include>requirements.txt</include>
+		<include>*/**</include>
             </includes>
             <excludes>
                 <exclude>**/*.pyc</exclude>
-            </excludes>
+		<exclude>target/**</exclude>
+		<exclude>docker/**</exclude>
+		<exclude>cover/**</exclude>
+		<exclude>pom.xml</exclude>
+		<exclude>assembly.xml</exclude>
+		<exclude>xunit-results.xml</exclude>
+	    </excludes>
         </fileSet>
     </fileSets>
     <baseDirectory>conductor</baseDirectory>
diff --git a/conductor/conductor/README.md b/conductor/conductor/README.md
deleted file mode 100644
index ba0316d..0000000
--- a/conductor/conductor/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Conductor
-
-OF-HAS is the implementation of the ONAP Homing Service. The formal project name in ONAP is *OF-HAS*. The informal name for the project is *Conductor* (inherited from the seed-code), which is interchangeably used through the project.
-
-Given the description of what needs to be deployed (demands) and the placement requirements (constraints), Conductor determines placement candidates that meet all constraints while optimizing the resource usage of the AIC infrastructure. A customer request may be satisfied by deploying new VMs in AIC (AIC inventory) or by using existing service instances with enough remaining capacity (service inventory).
-
-From a canonical standpoint, Conductor is known as a *homing service*, in the same way OpenStack Heat is an orchestration service, or Nova is a compute service.
-
-* License: Licensed under the Apache License, Version 2.0
-* [PyPI]() - package installation
-* [Python/Linux Distribution Notes](/doc/distribution/README.md)
-* [Conductor Template Guide](/doc/template/README.md)
-* [Example Templates](/doc/examples/README.md)
-* [Homing API](/doc/api/README.md)
-* [Bugs](https://jira.onap.org/projects/OPTFRA/summary) - issue tracking
-* [Source](https://gerrit.onap.org/r/optf/has)
diff --git a/conductor/conductor/README.rst b/conductor/conductor/README.rst
deleted file mode 100644
index c90eff6..0000000
--- a/conductor/conductor/README.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-=========
-Conductor
-=========
-
-OF-HAS is the implementation of the ONAP Homing Service. The formal project name in ONAP is *OF-HAS*. The informal name for the project is *Conductor* (inherited from the seed-code), which is interchangeably used through the project.
-
-Given the description of what needs to be deployed (demands) and the placement requirements (constraints), Conductor determines placement candidates that meet all constraints while optimizing the resource usage of the AIC infrastructure. A customer request may be satisfied by deploying new VMs in AIC (AIC inventory) or by using existing service instances with enough remaining capacity (service inventory).
-
-From a canonical standpoint, Conductor is known as a *homing service*, in the same way OpenStack Heat is an orchestration service, or Nova is a compute service.
-
-* License: Licensed under the Apache License, Version 2.0
-* `PyPI`_ - package installation
-* `Python/Linux Distribution Notes`_
-* `Conductor Template Guide`_
-* `Example Templates`_
-* `Homing API`_
-* `Bugs`_ - issue tracking
-* `Source`_
-
-.. _PyPI:
-.. _Python/Linux Distribution Notes: /doc/distribution/README.md
-.. _Conductor Template Guide: /doc/template/README.md
-.. _Example Templates: /examples/README.md
-.. _Homing API: /doc/api/README.md
-.. _Bugs: https://jira.onap.org/projects/OPTFRA/summary
-.. _Source: https://gerrit.onap.org/r/optf/has
diff --git a/conductor/conductor/setup.cfg b/conductor/conductor/setup.cfg
deleted file mode 100644
index 8e3fc56..0000000
--- a/conductor/conductor/setup.cfg
+++ /dev/null
@@ -1,71 +0,0 @@
-[metadata]
-name = of-has
-summary = ONAP Homing Service
-description-file = README.rst
-author = AT&T
-author-email = ikram@research.att.com
-home-page = https://wiki.onap.org/pages/viewpage.action?pageId=16005528
-classifier =
-    Development Status :: 4 - Beta
-    Environment :: ONAP
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved  :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-keywords =
-    onap
-    homing
-    conductor
-
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
-[files]
-packages =
-    conductor
-data_files =
-    etc/conductor = etc/conductor/*
-#    conductor_integrationtests
-#scripts =
-#    bin/conductor-db-setup
-
-[entry_points]
-wsgi_scripts =
-    conductor-api = conductor.api.app:build_wsgi_app
-
-console_scripts =
-    conductor-controller = conductor.cmd.controller:main
-    conductor-data = conductor.cmd.data:main
-    conductor-solver = conductor.cmd.solver:main
-    conductor-reservation = conductor.cmd.reservation:main
-
-conductor.inventory_provider.plugin =
-    aai = conductor.data.plugins.inventory_provider.aai:AAI
-
-conductor.service_controller.plugin =
-    sdnc = conductor.data.plugins.service_controller.sdnc:SDNC
-
-oslo.config.opts =
-    conductor = conductor.opts:list_opts
-
-oslo.config.opts.defaults =
-    conductor = conductor.conf.defaults:set_cors_middleware_defaults
-
-#tempest.test_plugins =
-#    conductor_tests = conductor_integrationtests.plugin:ConductorTempestPlugin
-
-#[build_sphinx]
-#all_files = 1
-#build-dir = doc/build
-#source-dir = doc/source
-
-[pbr]
-warnerrors = true
-autodoc_index_modules = true
-
diff --git a/conductor/conductor/setup.py b/conductor/conductor/setup.py
deleted file mode 100644
index 0c696ed..0000000
--- a/conductor/conductor/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-# -------------------------------------------------------------------------
-#   Copyright (c) 2015-2017 AT&T Intellectual Property
-#
-#   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.
-#
-# -------------------------------------------------------------------------
-#
-
-'''Setup'''
-
-import setuptools
-
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa # pylint: disable=W0611,C0411
-except ImportError:
-    pass
-
-setuptools.setup(
-    setup_requires=['pbr>=1.8'],
-    pbr=True)
diff --git a/conductor/pom.xml b/conductor/pom.xml
index b18ac36..0867668 100644
--- a/conductor/pom.xml
+++ b/conductor/pom.xml
@@ -21,13 +21,13 @@
 
     <parent>
         <groupId>org.onap.optf.has</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
         <artifactId>optf-has</artifactId>
     </parent>
 
     <groupId>org.onap.optf.has</groupId>
     <artifactId>optf-has-conductor</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
 
     <name>optf-has-conductor</name>
     <description>Homing Allocation Service/Conductor</description>
diff --git a/pom.xml b/pom.xml
index 9c6a7d8..59c9b9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>optf-has</artifactId>
 
     <name>optf-has</name>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <description>Homing Allocation Service</description>
 
     <modules>
diff --git a/push-dockers.sh b/push-dockers.sh
index 59cb7d4..f67944e 100755
--- a/push-dockers.sh
+++ b/push-dockers.sh
@@ -1,43 +1,42 @@
-#!/bin/bash 

-BUILD_ARGS="--no-cache" 

-ORG="onap" 

-VERSION="1.1.0" 

-PROJECT="optf" 

-IMAGE="api" 

-DOCKER_REPOSITORY="nexus3.onap.org:10003" 

-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" 

-TIMESTAMP=$(date +"%Y%m%dT%H%M%S") 

- 

-if [ $HTTP_PROXY ]; then 

-BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" 

-fi 

-if [ $HTTPS_PROXY ]; then 

-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" 

-fi 

- 

-function tag {

-     echo "Tagging !!!"

-     docker tag api "nexus3.onap.org:10003/onap/optf/api"

-     docker tag data "nexus3.onap.org:10003/onap/optf/data"

-     docker tag controller "nexus3.onap.org:10003/onap/optf/controller"

-     docker tag solver "nexus3.onap.org:10003/onap/optf/solver"

-     docker tag reservation "nexus3.onap.org:10003/onap/optf/reservation"

-}

-

-

-function push_image { 

-     echo "Start push ${IMAGE_NAME}:latest" 

-     

-     tag

-     docker push "nexus3.onap.org:10003/onap/optf/api"

-     docker push "nexus3.onap.org:10003/onap/optf/data"

-     docker push "nexus3.onap.org:10003/onap/optf/controller"

-     docker push "nexus3.onap.org:10003/onap/optf/solver"

-     docker push "nexus3.onap.org:10003/onap/optf/reservation"

-     

-     #docker push ${IMAGE_NAME}:latest 

-     #push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest 

-     #push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest 

-     #push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP} 

- } 

-push_image

+#!/bin/bash
+BUILD_ARGS="--no-cache"
+ORG="onap"
+VERSION="1.1.0"
+PROJECT="optf"
+IMAGE="api"
+DOCKER_REPOSITORY="nexus3.onap.org:10003"
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
+ 
+if [ $HTTP_PROXY ]; then
+BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ $HTTPS_PROXY ]; then
+    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
+fi
+ 
+function tag {
+     echo "Tagging !!!"
+     docker tag api "nexus3.onap.org:10003/onap/optf/api"
+     docker tag data "nexus3.onap.org:10003/onap/optf/data"
+     docker tag controller "nexus3.onap.org:10003/onap/optf/controller"
+     docker tag solver "nexus3.onap.org:10003/onap/optf/solver"
+     docker tag reservation "nexus3.onap.org:10003/onap/optf/reservation"
+}
+
+function push_image {
+     echo "Start push ${IMAGE_NAME}:latest"
+     
+     tag
+     docker push "nexus3.onap.org:10003/onap/optf/api"
+     docker push "nexus3.onap.org:10003/onap/optf/data"
+     docker push "nexus3.onap.org:10003/onap/optf/controller"
+     docker push "nexus3.onap.org:10003/onap/optf/solver"
+     docker push "nexus3.onap.org:10003/onap/optf/reservation"
+     
+     #docker push ${IMAGE_NAME}:latest
+     #push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+     #push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+     #push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
+ }
+push_image