fixes to accomodate docker creation in ONF - added onap-enabler parent POM, renamed osam-core to osam-core-framework and removed junit that requires connection to DB
Change-Id: Ifdc95438c8b1e5856860882824a11eecac80e19a
Signed-off-by: Aharoni, Pavel (pa0916) <pavel.aharoni@intl.att.com>
diff --git a/.gitignore b/.gitignore
index 1d628e6..5770d12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
blackDuckHubProjectName.txt
blackDuckHubProjectVersionName.txt
-/osam-core-ext-services-simulator/target/
-/onap-enabler-infra/target/
-/onap-enabler-be/target/
osam-core-parent_bdio.jsonld
-deliveries/target/
*.log
**/.idea/**
*.iml
@@ -12,10 +8,7 @@
**/.project
**/.settings/**
/osam-core-ext-services-simulator/.gitignore
-/onap-enabler-infra/overlays/**
-/onap-enabler-be/overlays/**
-/onap-enabler-infra/TO_BE_REMOVED
-/onap-enabler-be/TO_BE_REMOVED
+**/overlays/
#### OSAM core
diff --git a/onap-enabler-be/pom.xml b/onap-enabler-be/pom.xml
deleted file mode 100644
index 3939a63..0000000
--- a/onap-enabler-be/pom.xml
+++ /dev/null
@@ -1,651 +0,0 @@
-<?xml version="1.0"?>
-<!--/*-
- * ============LICENSE_START=======================================================
- * OSAM Core
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */-->
-
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- This is the Maven project object model (POM) file for VID web application
- based on the ECOMP SDK distribution. This file stands alone; it does not
- inherit from a parent maven module. -->
- <groupId>org.onap.osam</groupId>
- <artifactId>onap-enabler-be</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <properties>
- <encoding>UTF-8</encoding>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>2.4.0</epsdk.version>
- <springframework.version>4.2.9.RELEASE</springframework.version>
- <hibernate.version>4.3.11.Final</hibernate.version>
- <!-- Skip assembling the zip by default -->
- <skipassembly>true</skipassembly>
- <!-- Tests usually require some setup that maven cannot do, so skip. -->
- <!--<skiptests>false</skiptests>-->
- <nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
- <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
- <swagger.version>2.8.0</swagger.version>
- </properties>
-
-
- <!-- this should be commented for local debugging -->
- <!-- <deployenv>local</deployenv> -->
-
- <repositories>
- <repository>
- <id>ecomp-releases</id>
- <name>VID Release Repository</name>
- <url>${nexusproxy}${releaseNexusPath}</url>
- </repository>
- <repository>
- <id>ecomp-snapshots</id>
- <name>VID Snapshot Repository</name>
- <url>${nexusproxy}${snapshotNexusPath}</url>
- </repository>
- <repository>
- <id>ecomp-staging</id>
- <name>VID Staging Repository</name>
- <url>${nexusproxy}${stagingNexusPath}</url>
- </repository>
- <repository>
- <!-- Snapshots repository has ECOMP snapshot artifacts -->
- <id>oss-snapshots</id>
- <name>oss Central - Snapshots</name>
- <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
- </repository>
- <repository>
- <id>maven2-repo</id>
- <name>Maven2 repo</name>
- <url>https://repo.maven.apache.org/maven2</url>
- </repository>
- </repositories>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>VID Release Repository</name>
- <url>${nexusproxy}/${releaseNexusPath}</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>VID Snapshot Repository</name>
- <url>${nexusproxy}/${snapshotNexusPath}</url>
- </snapshotRepository>
- <!-- added for javadoc -->
- <site>
- <id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
- </site>
- </distributionManagement>
-
- <build>
- <finalName>onap-enabler-be</finalName>
-
- <plugins>
- <!-- License plugin should only run once at the start of the project.
- For new classes, the header should be added manually by the company which creates it.-->
-
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.16</version>
- <configuration>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <licenseName>apache_v2</licenseName>
- <inceptionYear>2018</inceptionYear>
- <organizationName>AT&T</organizationName>
- <projectName>OSAM</projectName>
- <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription>
- <canUpdateLicense>true</canUpdateLicense>
- <emptyLineAfterHeader>true</emptyLineAfterHeader>
- <verbose>false</verbose>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>first</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- </plugin-->
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.9</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
-
- <!-- Generate POJOs from MSO json schema -->
- <plugin>
- <groupId>org.jsonschema2pojo</groupId>
- <artifactId>jsonschema2pojo-maven-plugin</artifactId>
- <version>0.4.23</version>
- <configuration>
- <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>
- <targetPackage>org.onap.osam.domain.mso</targetPackage>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
- <configuration>
- <!--<skipTests>${skiptests}</skipTests>-->
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- <excludes>
- <exclude>**/selenium/*.java</exclude>
- <exclude>**/integrationTest/*.java</exclude>
- </excludes>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
- </additionalClasspathElements>
- <systemPropertyVariables>
- <container.classpath>classpath:</container.classpath>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <skipAssembly>${skipassembly}</skipAssembly>
- <descriptors>
- <descriptor>${basedir}/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <!-- Build a jar with all the Java classes -->
- <attachClasses>true</attachClasses>
- <!-- Do not put any jars in the war -->
- <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>2.2.4</version>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
- <includeOnlyProperties>
- <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
- <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>
- <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
- </includeOnlyProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <failOnError>false</failOnError>
- <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>org.umlgraph</groupId>
- <artifactId>umlgraph</artifactId>
- <version>5.6</version>
- </docletArtifact>
- <additionalparam>-views</additionalparam>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
-
- <dependency>
- <groupId>com.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>4.1</version>
- </dependency>
-
- <!-- HTTP client -->
-
- <dependency>
- <groupId>io.joshworks.unirest</groupId>
- <artifactId>unirest-java</artifactId>
- <version>0.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.3.6</version>
- </dependency>
- <dependency>
- <groupId>com.xebialabs.restito</groupId>
- <artifactId>restito</artifactId>
- <version>0.9.3</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Helpers -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>io.vavr</groupId>
- <artifactId>vavr</artifactId>
- <version>0.9.2</version>
- </dependency>
-
- <!-- SDK overlay war -->
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-app-overlay</artifactId>
- <version>${epsdk.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-app-common</artifactId>
- <version>${epsdk.version}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-core</artifactId>
- <version>${epsdk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-analytics</artifactId>
- <version>${epsdk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-workflow</artifactId>
- <version>${epsdk.version}</version>
- </dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
- </dependency>
-
- <!-- Mapper -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.6.7.1</version>
- </dependency>
- <dependency>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.5.2</version>
- </dependency>
- <dependency>
- <groupId>io.searchbox</groupId>
- <artifactId>jest</artifactId>
- <version>2.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- <!--<scope>test</scope>-->
- </dependency>
- <dependency>
- <groupId>com.google.code.bean-matchers</groupId>
- <artifactId>bean-matchers</artifactId>
- <version>0.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160212</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- <exclusions>
- <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- bridge to implement commons-logging using slf4j -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${springframework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>2.23.1</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.connectors</groupId>
- <artifactId>jersey-jetty-connector</artifactId>
- <version>2.23.1</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.6.3</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.9.3</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>2.53.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-api</artifactId>
- <version>2.53.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-firefox-driver</artifactId>
- <version>2.53.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.16</version>
- </dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.onap.sdc.sdc-tosca</groupId>
- <artifactId>sdc-tosca</artifactId>
- <version>1.4.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.javacrumbs.json-unit</groupId>
- <artifactId>json-unit</artifactId>
- <version>1.23.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>2.0.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.togglz</groupId>
- <artifactId>togglz-spring-core</artifactId>
- <version>2.5.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>3.10.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.osam</groupId>
- <artifactId>osam-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/FirstClass.java b/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/FirstClass.java
deleted file mode 100644
index b1db197..0000000
--- a/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/FirstClass.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OSAM
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-
-
-package org.onap.ecomp.vid.selenium;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.ie.InternetExplorerDriver;
-import org.openqa.selenium.support.ui.Select;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
-import org.testng.Assert;
-import org.testng.asserts.*;
-
-public class FirstClass {
-
- WebElement loginButton;
-
- /** The eg. */
- String eg;
-
- /** The login. */
- WebElement login;
-
- /** The pwd. */
- WebElement pwd;
-
- /** The log. */
- Logger log;
-
- /** The errormessage. */
- WebElement errormessage;
-
-
- /** The driver. */
- WebDriver driver=new FirefoxDriver();
-
-
-
- /** The config prop. */
- private final Properties configProp = new Properties();
-
-
- /**
- * Instantiates a new first class.
- */
- private FirstClass() {
- // TODO Auto-generated constructor stub
- //
- try{
- // InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
- //FileInputStream input1 = new FileInputStream("objectmap.properties");
-
- InputStream input =new FileInputStream("objectconfig.properties");
- System.out.println("Read all properties from file");
- configProp.load(input);
- System.out.println("Read all properties from file completed");
- }
- catch(IOException e) {
-
- e.printStackTrace();
- }
- }
-
-
- /*
-
-
- @BeforeClass
- public void setUp() {
- System.out.println("*******************");
- System.out.println("launching IE browser");
- System.setProperty("webdriver.ie.driver", driverPath+"IEDriverServer.exe");
- driver = new InternetExplorerDriver();
- driver.findElement(By.className());
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
- pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
- loginButton = driver.findElement(By.id("loginBtn"));
- }
-
-
- */
- /**
- * Sets the up.
- */
- // TODO Auto-generated method stub
- @BeforeClass
- public void setUp()
- {
-
-
- //WebDriver driver=new FirefoxDriver();
-
- log = Logger.getLogger(FirstClass.class.getName());
-
-
-
- // Get url
- driver.get(configProp.getProperty("baseURL"));
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath(configProp.getProperty("login")));
-
- pwd = driver.findElement(By.xpath(configProp.getProperty("pwd")));
- loginButton = driver.findElement(By.id(configProp.getProperty("loginButton")));
- }
-
-
- /**
- * Empty username password.
- */
- @Test(priority=1)
- public void emptyUsernamePassword()
- {
-
-
- //User Name and Password field is empty
- log.info("-----VID-11 TC-8----Username and password empty");
- loginButton.click();
- errormessage=driver.findElement(By.xpath("//*[@id='errorInfo']/span"));
- String errmsg= errormessage.getText();
- //System.out.println("Error message is"+errmsg);
- //String expected = "Invaild username or password, Please try again";
-
- //Assert.assertEquals(errmsg,expected);
-
- Boolean str = driver.getPageSource().contains("Invalid username or password, Please try again");
- System.out.println(driver.getPageSource().contains("Invalid username or password, Please try again"));
-
- if(str==true)
- {
- log.info("Error message validated");
- log.info("VID-11 TC-8 PASSED");
-
- }else
- log.error("Failed validation");
-
- }
-
-
-
- /**
- * Invalid user name.
- */
- @Test(priority=2)
- public void invalidUserName()
- {
-
- log.info("-----VID-11 TC-6----Invalid Username and Valid Password");
-
-
- login.sendKeys("xxx");
- pwd.sendKeys("abc123");
- loginButton.click();
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- String errmsg= errormessage.getText();
- String expected = "Invalid username or password, Please try again";
- Assert.assertEquals(errmsg,expected);
- //Boolean str1 = driver.getPageSource().contains("Invalid username or password, Please try again");
- //System.out.print(str1);
-
- log.info("VID-11 TC-6 PASSED");
-
- }
-
-
- /**
- * Invalid password.
- */
- @Test(priority=3)
- public void invalidPassword()
- {
- log.info("-----VID-11 TC-7----Valid Username and Invalid Password");
- // Valid user name and Invalid password.
- login.clear();
- pwd.clear();
- login.sendKeys("testuser");
- pwd.sendKeys("xxx");
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- String errmsg= errormessage.getText();
- String expected = "Invalid username or password, Please try again";
- Assert.assertEquals(errmsg,expected);
-
- //Boolean str2 = driver.getPageSource().contains("Invaild username or password, Please try again");
- //System.out.print(str2);
-
- log.info("VID-11 TC-7 PASSED");
- }
-
-
- /**
- * Login successful.
- */
- @Test(priority=4)
- public void loginSuccessful()
- {
- log.info("-----VID-11 TC-1----Valid Username and Valid Password");
- //Login with valid user name and password.
- login.clear();
- login.sendKeys("su");
- pwd.clear();
- pwd.sendKeys("fusion");
-
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- try {
- Thread.sleep(6000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- log.info("VID-11 TC-1 PASSED");
-
- }
-
-
- /**
- * Verify home page elements left pane.
- */
- @Test(priority=5)
- public void verifyHomePageElementsLeftPane()
-
- {
-
-
- log.info("VID-10 TC 1 ");
- //VID Home
- log.info("VID 11 TC-2");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[1]/a/span")).isDisplayed();
- //Create New Service Instance
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[2]/a/span")).isDisplayed();
-
- //Browse Service Type
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[3]/a/span")).isDisplayed();
- //View Log
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[4]/a/span")).isDisplayed();
-
- //Profile
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[5]/a/span")).isDisplayed();
- //Admin
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).isDisplayed();
- //Logout
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a/span")).isDisplayed();
-
- //Infrastructure Subscriber Name
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[1]/div/label")).isDisplayed();
- //Infrastructure Subscriber Name Select Drop down
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")).isDisplayed();
- //Infrastructure Service Type
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[1]/div/label")).isDisplayed();
- //Infrastructure Service Type Select Drop down
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")).isDisplayed();
- //Submit button
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).isDisplayed();
-
- //Login Snippet Icon
- driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).isDisplayed();
-
-
- //String bodyText = driver.findElement(By.tagName("body")).getText();
- //Assert.assertTrue("Text not found!", bodyText.contains("Search Existing Service Instances"));
- //Assert.IsTrue(driver.getPageSource.Contains("Search Existing Service Instances"));
-
- log.info("VID-12 TC-1");
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- Assert.assertTrue(driver.getPageSource().contains("Please search by the Subscriber name or Service Type from below:"));
- log.info("VID-12 TC-1 PASSED");
- log.info("VID-10 TC 1 PASSED");
- log.info("VID-11 TC-2 PASSED");
- }
-
-
- /**
- * Disabled submit button.
- */
- @Test(priority=6)
- public void disabledSubmitButton()
- {
- log.info("VID-12 TC-13");
- //Assert submit button disabled.
- Assert.assertFalse(driver.findElement(By.xpath(configProp.getProperty("submitButton"))).isEnabled());
- log.info("VID-12 TC-13 PASSED");
-
- }
-
- /**
- * Default list box value.
- */
- @Test(priority=7)
- public void defaultListBoxValue()
- {
- log.info("VID-12 TC-2");
-
-
- //WebElement subscribername =driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
-
- Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
- Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
-
-
- WebElement ielement=iSelect.getFirstSelectedOption();
- WebElement oelement=oSelect.getFirstSelectedOption();
- String defaultsubscribername=oelement.getText();
- String defaultservicetype=ielement.getText();
-
- Assert.assertEquals(defaultsubscribername,"Select Subscriber Name");
- Assert.assertEquals(defaultservicetype,"Select Service Type");
-
-
-
-
- //Verify Select Subscriber Name isDisplayed.
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select/option[1]")).isSelected();
-
- //Verify Select Service Type isDisplayed.
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select/option[1]")).isSelected();
-
-
- log.info("VID-12 TC-2 PASSED");
-
- }
-
-
-
- /**
- * Select subscriber name drop down.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=8)
- public void selectSubscriberNameDropDown() throws InterruptedException
- {
- log.info("------------------VID-10 TC-2,VID-12 TC-11, VID-12 TC-9, VID 12 TC-10,VID-12 TC-6, VID 12 TC-5--------------------");
-
-
- driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")));
-
- driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown")));
- Thread.sleep(5000);
-
- //Infrastructure Subscriber Name
- Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
-
- List <WebElement> elementCount = oSelect.getOptions();
- log.info("Select Element Count of Service Name");
- System.out.println(elementCount.size());
-
-
- //Verifying getInfrastructureSubscribersList
- log.info("VID-29 TC-1");
- Assert.assertTrue(elementCount.size()>0);
- log.info("VID-29 TC-1 PASSED");
-
- oSelect.selectByIndex(2);
- String selectedOption = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")))).getFirstSelectedOption().getText();
-
- System.out.println("Service Name selected is " +selectedOption);
- log.info("VID-10 TC-2 PASSED");
-
- //Submit button is clicked
- driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
-
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- //Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
-
-
- //Verify whether the page header is displayed "Global Customer ID"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
- Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
- Assert.assertTrue(driver.getPageSource().contains("Subscriber Name"));
- Assert.assertTrue(driver.getPageSource().contains("Service Type"));
- Assert.assertTrue(driver.getPageSource().contains("Service Instance ID"));
-
- log.info("VID-12 TC-5 PASSED");
- log.info("VID-12 TC-11 PASSED");
-
- WebElement serviceinstancetable =driver.findElement(By.xpath("//table[@class='tablesorter tablesorter-default ng-isolate-scope']"));
-
- List<WebElement> rows_table = serviceinstancetable.findElements(By.tagName("tr"));
- //To calculate no of rows In table.
- int rows_count = rows_table.size();
-
- //Loop will execute till the last row of table.
- for (int row=0; row<rows_count; row++){
- //To locate columns(cells) of that specific row.
- List<WebElement> Columns_row = rows_table.get(row).findElements(By.tagName("td"));
- //To calculate no of columns(cells) In that specific row.
- int columns_count = Columns_row.size();
- //System.out.println("Number of cells In Row "+row+" are "+columns_count);
-
- //Loop will execute till the last cell of that specific row.
- for (int column=0; column<columns_count; column++){
- //To retrieve text from that specific cell.
- String celtext = Columns_row.get(column).getText();
- //System.out.println("Cell Value Of row number "+row+" and column number "+column+" Is "+celtext);
-
-
-
- //log.info("Testing Get column and row value");
- List <WebElement> exx= rows_table.get(1).findElements(By.tagName("td"));
- eg=Columns_row.get(2).getText();
- // System.out.println("Cell value of row 1 and column 2 is" +eg);
- }
- }
-
-
-
-
- //Verify View/Edit isDisplayed and Click
-
- driver.findElement(By.xpath("//a[@alt='View/Edit']")).isDisplayed();
-
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/tbody/tr[1]/td[1]/div/a")).click();
-
- log.info("User clicked View/Edit");
-
- //Verify the Subscriber Name displayed.
- String header= driver.findElement(By.xpath("//h1[@class='heading1 ng-binding']")).getText();
- //System.out.println(header);
-
-
- if(header.contains(eg))
- {
- System.out.println("Header contains the subscriber name");
- }else
- System.out.println("Header does not contain the subscriber name");
-
-
-
- Assert.assertTrue(driver.getPageSource().contains("PerfTest Subscriber00020021"));
- log.info("VID-12 TC-6 PASSED");
-
-
-
- driver.navigate().back();
- //Cancel button isDisplayed
- driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).isDisplayed();
- log.info("VID-12 TC-9 PASSED");
-
- //Cancel button is clicked
- driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).click();
- log.info("Cancel button is clicked");
-
- //Verifying VID Home page is displayed
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- log.info("VID-12 TC-10 PASSED");
-
- }
-
-
- /**
- * Refresh subscriber name.
- */
- @Test(priority=9)
- public void refreshSubscriberName()
- {
- log.info("VID-10 TC-4");
-
-
- driver.findElement(By.xpath(configProp.getProperty("refreshButtonSubscriberName"))).isDisplayed();
-
- log.info("VID-10 TC-4 PASSED");
-
-
- }
-
-
- /**
- * Select subscriber type drop down.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=9)
- public void selectSubscriberTypeDropDown() throws InterruptedException
- {
- Thread.sleep(5000);
- log.info("------------------VID-10 TC-3, VID-12 TC-12,--------------------");
- //Infrastructure Subscriber Type
- Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
-
- List <WebElement> ielementCount = iSelect.getOptions();
- log.info("Select Element Count of Service type");
- System.out.println(ielementCount.size());
- iSelect.selectByIndex(1);
-
- log.info("VID-10 TC-3 PASSED");
-
-
- //Submit button is clicked
- driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- //Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
- log.info("Page Header: Selected Subscriber's Service Instance Details");
-
-
- //Verify whether the page header is displayed "Global Customer ID"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
-
- //Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
- log.info("Table is displayed");
-
- log.info("VID-12 TC-12 PASSED");
-
- }
-
-
-
- /**
- * Logout under profile.
- */
- @Test(priority=10)
- public void logoutUnderProfile()
- {
-
- log.info("-----------VID-11 TC-5---------------------");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).click();
- driver.findElement(By.xpath(".//*[@id='reg-logout-div']/a")).click();
- //Validate that the user has logged out of VID. Displays "Portal"
- Assert.assertTrue(driver.getPageSource().contains("Portal"));
-
- log.info("VID-11 TC-5 PASSED");
-
- }
-
-
-
- /**
- * Tear down.
- */
- @AfterClass
- public void tearDown()
- {
- driver.close();
-
- }
-
-
-
- }
-
-
-
-
diff --git a/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/LogOutLeftPane.java b/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/LogOutLeftPane.java
deleted file mode 100644
index 1511c2d..0000000
--- a/onap-enabler-be/src/test/java/org/onap/ecomp/vid/selenium/LogOutLeftPane.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OSAM
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-
-
-package org.onap.ecomp.vid.selenium;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.log4j.Logger;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.support.ui.Select;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-@Test(enabled=false)
-public class LogOutLeftPane {
-
- WebElement loginButton;
-
- /** The login. */
- WebElement login;
-
- /** The pwd. */
- WebElement pwd;
-
- /** The log. */
- Logger log;
-
- /** The errormessage. */
- WebElement errormessage;
-
- /** The driver. */
- WebDriver driver=new FirefoxDriver();
-
-
- /** The config prop. */
- private final Properties configProp = new Properties();
-
-
- /**
- * Instantiates a new log out left pane.
- */
- private LogOutLeftPane() {
- // TODO Auto-generated constructor stub
- //
- try{
- // InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
- //FileInputStream input1 = new FileInputStream("objectmap.properties");
-
- InputStream input =new FileInputStream("objectconfig.properties");
- System.out.println("Read all properties from file");
- configProp.load(input);
- System.out.println("Read all properties from file completed");
- }
- catch(IOException e) {
-
- e.printStackTrace();
- }
- }
-
-
-
-
- /**
- * Do before test.
- */
- // TODO Auto-generated method stub
- @BeforeTest
- public void doBeforeTest()
- {
- //WebDriver driver=new FirefoxDriver();
-
- log = Logger.getLogger(LogOutLeftPane.class.getName());
-
-
-
- // Get url
- driver.get("http://vid.onap.org:9080/vid/login_external.htm");
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
- pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
- loginButton = driver.findElement(By.id("loginBtn"));
- }
-
-
- /**
- * Expand collapse panel.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=1)
- public void expandCollapsePanel() throws InterruptedException
- {
-
-
-
- login.clear();
- login.sendKeys("su");
- pwd.clear();
- pwd.sendKeys("fusion");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- log.info("Clicking Profile link from left pane");
- Thread.sleep(3000);
- System.out.println("properties file details --->"+configProp.getProperty("profilelink"));
- driver.findElement(By.xpath(configProp.getProperty("profilelink"))).click();
- Thread.sleep(3000);
-
- //Verify whether the sub panel is displayed
- //To verify the following :Search import from webphone and Self
- driver.findElement(By.xpath(".//*[@id='panel4']")).isDisplayed();
- log.info("Expand and collapse passed for Profile link");
-
- //For Admin
- //Verify expand and collapse working for ADMIN
- log.info("Clicking Admin link from left pane");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).click();
- //To verify the following: Roles, Roles Functions, Usages
- driver.findElement(By.xpath(".//*[@id='panel5']")).isDisplayed();
-
-
- log.info("Expand and collapse passed for ADMIN link");
-
- log.info("VID-11 TC-3 PASSED");
-
- }
-
-
- /**
- * Drop down list.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=2)
- public void dropDownList() throws InterruptedException
- {
- //VID-12 TC-3
- log.info("VID-12 TC-3");
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
-
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select"));
- Thread.sleep(5000);
-
- //Infrastructure Subscriber Name
- Select oSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")));
- Select iSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")));
-
- List <WebElement> elementCount = oSelect.getOptions();
- log.info("Subscriber Name Drop Down");
- System.out.println(elementCount.size());
- oSelect.selectByIndex(1);
- log.info("Subscriber name selected");
- //String selectedOption = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"))).getFirstSelectedOption().getText();
-
-
- List <WebElement> count = iSelect.getOptions();
- log.info("Subscriber type drop down");
- System.out.println(count.size());
- oSelect.selectByIndex(1);
- log.info("Subscriber type selected");
-
-
-
- //Submit button is clicked
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).click();
-
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- log.info("VID-12 TC-3 PASSED");
- }
-
-
-
-
- /**
- * Logout left pane.
- */
- @Test(priority=3)
- public void logoutLeftPane()
- {
- //To Verify if the logout link redirects to Login page when clicked.
-
-
- /*log.info("----------------VID-11 TC-4----------------");
- login.clear();
- login.sendKeys("testuser");
- pwd.clear();
- pwd.sendKeys("abc123");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);*/
- log.info("----------------VID-11 TC-4----------------");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a")).click();
- //Validate that the user has logged out of VID. Displays "Portal"
- Assert.assertTrue(driver.getPageSource().contains("Portal"));
-
- log.info("VID 11 TC-4 PASSED");
-
- driver.close();
-
- }
-
-}
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/selenium/FirstClass.java b/onap-enabler-be/src/test/java/org/onap/osam/selenium/FirstClass.java
deleted file mode 100644
index 188d27d..0000000
--- a/onap-enabler-be/src/test/java/org/onap/osam/selenium/FirstClass.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OSAM
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-
-
-package org.onap.osam.selenium;
-
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.support.ui.Select;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
-import org.testng.Assert;
-
-public class FirstClass {
-
- WebElement loginButton;
-
- /** The eg. */
- String eg;
-
- /** The login. */
- WebElement login;
-
- /** The pwd. */
- WebElement pwd;
-
- /** The log. */
- Logger log;
-
- /** The errormessage. */
- WebElement errormessage;
-
-
- /** The driver. */
- WebDriver driver=new FirefoxDriver();
-
-
-
- /** The config prop. */
- private final Properties configProp = new Properties();
-
-
- /**
- * Instantiates a new first class.
- */
- private FirstClass() {
- // TODO Auto-generated constructor stub
- //
- try{
- // InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
- //FileInputStream input1 = new FileInputStream("objectmap.properties");
-
- InputStream input =new FileInputStream("objectconfig.properties");
- System.out.println("Read all properties from file");
- configProp.load(input);
- System.out.println("Read all properties from file completed");
- }
- catch(IOException e) {
-
- e.printStackTrace();
- }
- }
-
-
- /*
-
-
- @BeforeClass
- public void setUp() {
- System.out.println("*******************");
- System.out.println("launching IE browser");
- System.setProperty("webdriver.ie.driver", driverPath+"IEDriverServer.exe");
- driver = new InternetExplorerDriver();
- driver.findElement(By.className());
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
- pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
- loginButton = driver.findElement(By.id("loginBtn"));
- }
-
-
- */
- /**
- * Sets the up.
- */
- // TODO Auto-generated method stub
- @BeforeClass
- public void setUp()
- {
-
-
- //WebDriver driver=new FirefoxDriver();
-
- log = Logger.getLogger(FirstClass.class.getName());
-
-
-
- // Get url
- driver.get(configProp.getProperty("baseURL"));
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath(configProp.getProperty("login")));
-
- pwd = driver.findElement(By.xpath(configProp.getProperty("pwd")));
- loginButton = driver.findElement(By.id(configProp.getProperty("loginButton")));
- }
-
-
- /**
- * Empty username password.
- */
- @Test(priority=1)
- public void emptyUsernamePassword()
- {
-
-
- //User Name and Password field is empty
- log.info("-----VID-11 TC-8----Username and password empty");
- loginButton.click();
- errormessage=driver.findElement(By.xpath("//*[@id='errorInfo']/span"));
- String errmsg= errormessage.getText();
- //System.out.println("Error message is"+errmsg);
- //String expected = "Invaild username or password, Please try again";
-
- //Assert.assertEquals(errmsg,expected);
-
- Boolean str = driver.getPageSource().contains("Invalid username or password, Please try again");
- System.out.println(driver.getPageSource().contains("Invalid username or password, Please try again"));
-
- if(str==true)
- {
- log.info("Error message validated");
- log.info("VID-11 TC-8 PASSED");
-
- }else
- log.error("Failed validation");
-
- }
-
-
-
- /**
- * Invalid user name.
- */
- @Test(priority=2)
- public void invalidUserName()
- {
-
- log.info("-----VID-11 TC-6----Invalid Username and Valid Password");
-
-
- login.sendKeys("xxx");
- pwd.sendKeys("abc123");
- loginButton.click();
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- String errmsg= errormessage.getText();
- String expected = "Invalid username or password, Please try again";
- Assert.assertEquals(errmsg,expected);
- //Boolean str1 = driver.getPageSource().contains("Invalid username or password, Please try again");
- //System.out.print(str1);
-
- log.info("VID-11 TC-6 PASSED");
-
- }
-
-
- /**
- * Invalid password.
- */
- @Test(priority=3)
- public void invalidPassword()
- {
- log.info("-----VID-11 TC-7----Valid Username and Invalid Password");
- // Valid user name and Invalid password.
- login.clear();
- pwd.clear();
- login.sendKeys("testuser");
- pwd.sendKeys("xxx");
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- String errmsg= errormessage.getText();
- String expected = "Invalid username or password, Please try again";
- Assert.assertEquals(errmsg,expected);
-
- //Boolean str2 = driver.getPageSource().contains("Invaild username or password, Please try again");
- //System.out.print(str2);
-
- log.info("VID-11 TC-7 PASSED");
- }
-
-
- /**
- * Login successful.
- */
- @Test(priority=4)
- public void loginSuccessful()
- {
- log.info("-----VID-11 TC-1----Valid Username and Valid Password");
- //Login with valid user name and password.
- login.clear();
- login.sendKeys("su");
- pwd.clear();
- pwd.sendKeys("fusion");
-
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- try {
- Thread.sleep(6000);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- log.info("VID-11 TC-1 PASSED");
-
- }
-
-
- /**
- * Verify home page elements left pane.
- */
- @Test(priority=5)
- public void verifyHomePageElementsLeftPane()
-
- {
-
-
- log.info("VID-10 TC 1 ");
- //VID Home
- log.info("VID 11 TC-2");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[1]/a/span")).isDisplayed();
- //Create New Service Instance
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[2]/a/span")).isDisplayed();
-
- //Browse Service Type
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[3]/a/span")).isDisplayed();
- //View Log
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[4]/a/span")).isDisplayed();
-
- //Profile
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[5]/a/span")).isDisplayed();
- //Admin
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).isDisplayed();
- //Logout
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a/span")).isDisplayed();
-
- //Infrastructure Subscriber Name
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[1]/div/label")).isDisplayed();
- //Infrastructure Subscriber Name Select Drop down
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")).isDisplayed();
- //Infrastructure Service Type
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[1]/div/label")).isDisplayed();
- //Infrastructure Service Type Select Drop down
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")).isDisplayed();
- //Submit button
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).isDisplayed();
-
- //Login Snippet Icon
- driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).isDisplayed();
-
-
- //String bodyText = driver.findElement(By.tagName("body")).getText();
- //Assert.assertTrue("Text not found!", bodyText.contains("Search Existing Service Instances"));
- //Assert.IsTrue(driver.getPageSource.Contains("Search Existing Service Instances"));
-
- log.info("VID-12 TC-1");
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- Assert.assertTrue(driver.getPageSource().contains("Please search by the Subscriber name or Service Type from below:"));
- log.info("VID-12 TC-1 PASSED");
- log.info("VID-10 TC 1 PASSED");
- log.info("VID-11 TC-2 PASSED");
- }
-
-
- /**
- * Disabled submit button.
- */
- @Test(priority=6)
- public void disabledSubmitButton()
- {
- log.info("VID-12 TC-13");
- //Assert submit button disabled.
- Assert.assertFalse(driver.findElement(By.xpath(configProp.getProperty("submitButton"))).isEnabled());
- log.info("VID-12 TC-13 PASSED");
-
- }
-
- /**
- * Default list box value.
- */
- @Test(priority=7)
- public void defaultListBoxValue()
- {
- log.info("VID-12 TC-2");
-
-
- //WebElement subscribername =driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
-
- Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
- Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
-
-
- WebElement ielement=iSelect.getFirstSelectedOption();
- WebElement oelement=oSelect.getFirstSelectedOption();
- String defaultsubscribername=oelement.getText();
- String defaultservicetype=ielement.getText();
-
- Assert.assertEquals(defaultsubscribername,"Select Subscriber Name");
- Assert.assertEquals(defaultservicetype,"Select Service Type");
-
-
-
-
- //Verify Select Subscriber Name isDisplayed.
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select/option[1]")).isSelected();
-
- //Verify Select Service Type isDisplayed.
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select/option[1]")).isSelected();
-
-
- log.info("VID-12 TC-2 PASSED");
-
- }
-
-
-
- /**
- * Select subscriber name drop down.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=8)
- public void selectSubscriberNameDropDown() throws InterruptedException
- {
- log.info("------------------VID-10 TC-2,VID-12 TC-11, VID-12 TC-9, VID 12 TC-10,VID-12 TC-6, VID 12 TC-5--------------------");
-
-
- driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")));
-
- driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown")));
- Thread.sleep(5000);
-
- //Infrastructure Subscriber Name
- Select oSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown"))));
-
- List <WebElement> elementCount = oSelect.getOptions();
- log.info("Select Element Count of Service Name");
- System.out.println(elementCount.size());
-
-
- //Verifying getInfrastructureSubscribersList
- log.info("VID-29 TC-1");
- Assert.assertTrue(elementCount.size()>0);
- log.info("VID-29 TC-1 PASSED");
-
- oSelect.selectByIndex(2);
- String selectedOption = new Select(driver.findElement(By.xpath(configProp.getProperty("subscriberNameDropDown")))).getFirstSelectedOption().getText();
-
- System.out.println("Service Name selected is " +selectedOption);
- log.info("VID-10 TC-2 PASSED");
-
- //Submit button is clicked
- driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
-
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- //Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
-
-
- //Verify whether the page header is displayed "Global Customer ID"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
- Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
- Assert.assertTrue(driver.getPageSource().contains("Subscriber Name"));
- Assert.assertTrue(driver.getPageSource().contains("Service Type"));
- Assert.assertTrue(driver.getPageSource().contains("Service Instance ID"));
-
- log.info("VID-12 TC-5 PASSED");
- log.info("VID-12 TC-11 PASSED");
-
- WebElement serviceinstancetable =driver.findElement(By.xpath("//table[@class='tablesorter tablesorter-default ng-isolate-scope']"));
-
- List<WebElement> rows_table = serviceinstancetable.findElements(By.tagName("tr"));
- //To calculate no of rows In table.
- int rows_count = rows_table.size();
-
- //Loop will execute till the last row of table.
- for (int row=0; row<rows_count; row++){
- //To locate columns(cells) of that specific row.
- List<WebElement> Columns_row = rows_table.get(row).findElements(By.tagName("td"));
- //To calculate no of columns(cells) In that specific row.
- int columns_count = Columns_row.size();
- //System.out.println("Number of cells In Row "+row+" are "+columns_count);
-
- //Loop will execute till the last cell of that specific row.
- for (int column=0; column<columns_count; column++){
- //To retrieve text from that specific cell.
- String celtext = Columns_row.get(column).getText();
- //System.out.println("Cell Value Of row number "+row+" and column number "+column+" Is "+celtext);
-
-
-
- //log.info("Testing Get column and row value");
- List <WebElement> exx= rows_table.get(1).findElements(By.tagName("td"));
- eg=Columns_row.get(2).getText();
- // System.out.println("Cell value of row 1 and column 2 is" +eg);
- }
- }
-
-
-
-
- //Verify View/Edit isDisplayed and Click
-
- driver.findElement(By.xpath("//a[@alt='View/Edit']")).isDisplayed();
-
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/tbody/tr[1]/td[1]/div/a")).click();
-
- log.info("User clicked View/Edit");
-
- //Verify the Subscriber Name displayed.
- String header= driver.findElement(By.xpath("//h1[@class='heading1 ng-binding']")).getText();
- //System.out.println(header);
-
-
- if(header.contains(eg))
- {
- System.out.println("Header contains the subscriber name");
- }else
- System.out.println("Header does not contain the subscriber name");
-
-
-
- Assert.assertTrue(driver.getPageSource().contains("PerfTest Subscriber00020021"));
- log.info("VID-12 TC-6 PASSED");
-
-
-
- driver.navigate().back();
- //Cancel button isDisplayed
- driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).isDisplayed();
- log.info("VID-12 TC-9 PASSED");
-
- //Cancel button is clicked
- driver.findElement(By.xpath("//button[@class='button button--small button--primary']")).click();
- log.info("Cancel button is clicked");
-
- //Verifying VID Home page is displayed
- Assert.assertTrue(driver.getPageSource().contains("Search Existing Service Instances"));
- log.info("VID-12 TC-10 PASSED");
-
- }
-
-
- /**
- * Refresh subscriber name.
- */
- @Test(priority=9)
- public void refreshSubscriberName()
- {
- log.info("VID-10 TC-4");
-
-
- driver.findElement(By.xpath(configProp.getProperty("refreshButtonSubscriberName"))).isDisplayed();
-
- log.info("VID-10 TC-4 PASSED");
-
-
- }
-
-
- /**
- * Select subscriber type drop down.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=9)
- public void selectSubscriberTypeDropDown() throws InterruptedException
- {
- Thread.sleep(5000);
- log.info("------------------VID-10 TC-3, VID-12 TC-12,--------------------");
- //Infrastructure Subscriber Type
- Select iSelect = new Select(driver.findElement(By.xpath(configProp.getProperty("serviceTypeDropDown"))));
-
- List <WebElement> ielementCount = iSelect.getOptions();
- log.info("Select Element Count of Service type");
- System.out.println(ielementCount.size());
- iSelect.selectByIndex(1);
-
- log.info("VID-10 TC-3 PASSED");
-
-
- //Submit button is clicked
- driver.findElement(By.xpath(configProp.getProperty("submitButton"))).click();
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- //Assert.assertTrue(driver.getPageSource().contains("Selected Subscriber's Service Instance Details:"))
- log.info("Page Header: Selected Subscriber's Service Instance Details");
-
-
- //Verify whether the page header is displayed "Global Customer ID"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/div/table/thead/tr/th[2]/div")).isDisplayed();
-
- //Assert.assertTrue(driver.getPageSource().contains("Global Customer ID"));
- log.info("Table is displayed");
-
- log.info("VID-12 TC-12 PASSED");
-
- }
-
-
-
- /**
- * Logout under profile.
- */
- @Test(priority=10)
- public void logoutUnderProfile()
- {
-
- log.info("-----------VID-11 TC-5---------------------");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- driver.findElement(By.xpath(".//*[@class='icon-user-small login-snippet-icon']")).click();
- driver.findElement(By.xpath(".//*[@id='reg-logout-div']/a")).click();
- //Validate that the user has logged out of VID. Displays "Portal"
- Assert.assertTrue(driver.getPageSource().contains("Portal"));
-
- log.info("VID-11 TC-5 PASSED");
-
- }
-
-
-
- /**
- * Tear down.
- */
- @AfterClass
- public void tearDown()
- {
- driver.close();
-
- }
-
-
-
- }
-
-
-
-
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/selenium/LogOutLeftPane.java b/onap-enabler-be/src/test/java/org/onap/osam/selenium/LogOutLeftPane.java
deleted file mode 100644
index ca5c618..0000000
--- a/onap-enabler-be/src/test/java/org/onap/osam/selenium/LogOutLeftPane.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * OSAM
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-
-
-package org.onap.osam.selenium;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.log4j.Logger;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.support.ui.Select;
-import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-@Test(enabled=false)
-public class LogOutLeftPane {
-
- WebElement loginButton;
-
- /** The login. */
- WebElement login;
-
- /** The pwd. */
- WebElement pwd;
-
- /** The log. */
- Logger log;
-
- /** The errormessage. */
- WebElement errormessage;
-
- /** The driver. */
- WebDriver driver=new FirefoxDriver();
-
-
- /** The config prop. */
- private final Properties configProp = new Properties();
-
-
- /**
- * Instantiates a new log out left pane.
- */
- private LogOutLeftPane() {
- // TODO Auto-generated constructor stub
- //
- try{
- // InputStream input =this.getClass().getClassLoader().getResourceAsStream("objectmap.properties");
- //FileInputStream input1 = new FileInputStream("objectmap.properties");
-
- InputStream input =new FileInputStream("objectconfig.properties");
- System.out.println("Read all properties from file");
- configProp.load(input);
- System.out.println("Read all properties from file completed");
- }
- catch(IOException e) {
-
- e.printStackTrace();
- }
- }
-
-
-
-
- /**
- * Do before test.
- */
- // TODO Auto-generated method stub
- @BeforeTest
- public void doBeforeTest()
- {
- //WebDriver driver=new FirefoxDriver();
-
- log = Logger.getLogger(LogOutLeftPane.class.getName());
-
-
-
- // Get url
- driver.get("http://vid.onap.org:9080/vid/login_external.htm");
- driver.manage().window().maximize();
-
-
- login = driver.findElement(By.xpath("//input[@class='fn-ebz-text ng-pristine ng-valid']"));
- pwd = driver.findElement(By.xpath("//input[@class='span3 ng-pristine ng-valid']"));
- loginButton = driver.findElement(By.id("loginBtn"));
- }
-
-
- /**
- * Expand collapse panel.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=1)
- public void expandCollapsePanel() throws InterruptedException
- {
-
-
-
- login.clear();
- login.sendKeys("su");
- pwd.clear();
- pwd.sendKeys("fusion");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
-
- log.info("Clicking Profile link from left pane");
- Thread.sleep(3000);
- System.out.println("properties file details --->"+configProp.getProperty("profilelink"));
- driver.findElement(By.xpath(configProp.getProperty("profilelink"))).click();
- Thread.sleep(3000);
-
- //Verify whether the sub panel is displayed
- //To verify the following :Search import from webphone and Self
- driver.findElement(By.xpath(".//*[@id='panel4']")).isDisplayed();
- log.info("Expand and collapse passed for Profile link");
-
- //For Admin
- //Verify expand and collapse working for ADMIN
- log.info("Clicking Admin link from left pane");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[6]/a/span")).click();
- //To verify the following: Roles, Roles Functions, Usages
- driver.findElement(By.xpath(".//*[@id='panel5']")).isDisplayed();
-
-
- log.info("Expand and collapse passed for ADMIN link");
-
- log.info("VID-11 TC-3 PASSED");
-
- }
-
-
- /**
- * Drop down list.
- *
- * @throws InterruptedException the interrupted exception
- */
- @Test(priority=2)
- public void dropDownList() throws InterruptedException
- {
- //VID-12 TC-3
- log.info("VID-12 TC-3");
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"));
-
- //driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select"));
- Thread.sleep(5000);
-
- //Infrastructure Subscriber Name
- Select oSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select")));
- Select iSelect = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select")));
-
- List <WebElement> elementCount = oSelect.getOptions();
- log.info("Subscriber Name Drop Down");
- System.out.println(elementCount.size());
- oSelect.selectByIndex(1);
- log.info("Subscriber name selected");
- //String selectedOption = new Select(driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/select"))).getFirstSelectedOption().getText();
-
-
- List <WebElement> count = iSelect.getOptions();
- log.info("Subscriber type drop down");
- System.out.println(count.size());
- oSelect.selectByIndex(1);
- log.info("Subscriber type selected");
-
-
-
- //Submit button is clicked
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button")).click();
-
-
- //Verify whether the page header is displayed "Selected Subscriber's Service Instance Details:"
- driver.findElement(By.xpath(".//*[@id='mContent']/div/div/div/h1")).isDisplayed();
- log.info("VID-12 TC-3 PASSED");
- }
-
-
-
-
- /**
- * Logout left pane.
- */
- @Test(priority=3)
- public void logoutLeftPane()
- {
- //To Verify if the logout link redirects to Login page when clicked.
-
-
- /*log.info("----------------VID-11 TC-4----------------");
- login.clear();
- login.sendKeys("testuser");
- pwd.clear();
- pwd.sendKeys("abc123");
- //driver.findElement(By.partialLinkText("Click here to login")).click();
- //driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
-
- loginButton.click();
- driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);*/
- log.info("----------------VID-11 TC-4----------------");
- driver.findElement(By.xpath("html/body/div[1]/div[1]/div/div/div[2]/div/div/div[1]/div/div/accordion/div/div[7]/a")).click();
- //Validate that the user has logged out of VID. Displays "Portal"
- Assert.assertTrue(driver.getPageSource().contains("Portal"));
-
- log.info("VID 11 TC-4 PASSED");
-
- driver.close();
-
- }
-
-}
diff --git a/onap-enabler-infra/pom.xml b/onap-enabler-infra/pom.xml
deleted file mode 100644
index e2d288a..0000000
--- a/onap-enabler-infra/pom.xml
+++ /dev/null
@@ -1,506 +0,0 @@
-<?xml version="1.0"?>
-<!--/*-
- * ============LICENSE_START=======================================================
- * OSAM Core
- * ================================================================================
- * Copyright (C) 2018 AT&T
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- This is the Maven project object model (POM) file for the open-source
- SDK web app. This is NOT the Portal - but it is developed and supported by
- the Portal team. -->
- <groupId>org.onap.osam</groupId>
- <artifactId>onap-enabler-infra</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <properties>
- <encoding>UTF-8</encoding>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>2.4.0</epsdk.version>
- <springframework.version>4.2.9.RELEASE</springframework.version>
- <hibernate.version>4.3.11.Final</hibernate.version>
- <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
- <skipassembly>true</skipassembly>
- <!-- Tests usually require some setup that maven cannot do, so skip. -->
-<!--
- <skiptests>false</skiptests>
--->
- <nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
- <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
-
- <!-- SONAR -->
- <sonar.language>java</sonar.language>
- <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
- <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
- <sonar.projectVersion>${project.version}</sonar.projectVersion>
- <swagger.version>2.8.0</swagger.version>
- </properties>
-
- <repositories>
- <repository>
- <id>ecomp-releases</id>
- <name>VID Release Repository</name>
- <url>${nexusproxy}${releaseNexusPath}</url>
- </repository>
- <repository>
- <id>ecomp-snapshots</id>
- <name>VID Snapshot Repository</name>
- <url>${nexusproxy}${snapshotNexusPath}</url>
- </repository>
- <repository>
- <id>ecomp-staging</id>
- <name>VID Staging Repository</name>
- <url>${nexusproxy}${stagingNexusPath}</url>
- </repository>
- <repository>
- <!-- Snapshots repository has ECOMP snapshot artifacts -->
- <id>oss-snapshots</id>
- <name>oss Central - Snapshots</name>
- <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
- </repository>
- </repositories>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>VID Release Repository</name>
- <url>${nexusproxy}/${releaseNexusPath}</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>VID Snapshot Repository</name>
- <url>${nexusproxy}/${snapshotNexusPath}</url>
- </snapshotRepository>
- <!-- added for javadoc -->
- <site>
- <id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
- <profile>
- <id>doclint-java8-disable</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <finalName>onap-enabler</finalName>
- <plugins>
- <!-- License plugin should only run once at the start of the project.
- For new classes, the header should be added manually by the company which creates it.-->
-
- <!--<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.16</version>
- <configuration>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <licenseName>apache_v2</licenseName>
- <inceptionYear>2018</inceptionYear>
- <organizationName>AT&T</organizationName>
- <projectName>OSAM</projectName>
- <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription>
- <canUpdateLicense>true</canUpdateLicense>
- <emptyLineAfterHeader>true</emptyLineAfterHeader>
- <verbose>false</verbose>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>first</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- </plugin>-->
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
-
- <!-- Compile to Java 1.8 class output format -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
- <configuration>
-<!--
- <skipTests>${skiptests}</skipTests>
--->
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
- </additionalClasspathElements>
- <systemPropertyVariables>
- <container.classpath>classpath:</container.classpath>
- </systemPropertyVariables>
- </configuration>
- </plugin>
-
- <!-- add version number to manifest -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Build-Number>${project.version}</Build-Number>
- <Build-Time>${maven.build.timestamp}</Build-Time>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <skipAssembly>${skipassembly}</skipAssembly>
- <descriptors>
- <descriptor>${basedir}/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.6</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.sonarsource.scanner.maven</groupId>
- <artifactId>sonar-maven-plugin</artifactId>
- <version>3.3.0.603</version>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.9</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <failOnError>false</failOnError>
- <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>org.umlgraph</groupId>
- <artifactId>umlgraph</artifactId>
- <version>5.6</version>
- </docletArtifact>
- <additionalparam>-views</additionalparam>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <dependencies>
- <!-- SDK overlay war -->
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-app-overlay</artifactId>
- <version>${epsdk.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-app-common</artifactId>
- <version>${epsdk.version}</version>
- <type>jar</type>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.osam</groupId>
- <artifactId>onap-enabler-be</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.osam</groupId>
- <artifactId>onap-enabler-be</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <classifier>classes</classifier>
- </dependency>
- <!-- SDK components -->
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-core</artifactId>
- <version>${epsdk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-analytics</artifactId>
- <version>${epsdk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.portal.sdk</groupId>
- <artifactId>epsdk-workflow</artifactId>
- <version>${epsdk.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>1.0.0</version>
- </dependency>
-
- <!-- Mapper -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.6</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.6.7.1</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.5.2</version>
- </dependency>
- <dependency>
- <groupId>io.searchbox</groupId>
- <artifactId>jest</artifactId>
- <version>2.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160212</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- <exclusions>
- <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- bridge to implement commons-logging using slf4j -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.12</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${springframework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${springframework.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/onap-enabler/onap-enabler-be/pom.xml b/onap-enabler/onap-enabler-be/pom.xml
new file mode 100644
index 0000000..e376678
--- /dev/null
+++ b/onap-enabler/onap-enabler-be/pom.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0"?>
+<!--/*-
+ * ============LICENSE_START=======================================================
+ * OSAM Core
+ * ================================================================================
+ * Copyright (C) 2018 AT&T
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */-->
+
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler</artifactId>
+ <version>0.0.2</version>
+ </parent>
+ <artifactId>onap-enabler-be</artifactId>
+ <packaging>war</packaging>
+
+ <!-- this should be commented for local debugging -->
+ <!-- <deployenv>local</deployenv> -->
+
+
+ <build>
+ <finalName>onap-enabler-be</finalName>
+
+ <plugins>
+ <!-- License plugin should only run once at the start of the project.
+ For new classes, the header should be added manually by the company which creates it.-->
+
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>1.16</version>
+ <configuration>
+ <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+ <processStartTag>============LICENSE_START=======================================================</processStartTag>
+ <processEndTag>============LICENSE_END=========================================================</processEndTag>
+ <sectionDelimiter>================================================================================</sectionDelimiter>
+ <licenseName>apache_v2</licenseName>
+ <inceptionYear>2018</inceptionYear>
+ <organizationName>AT&T</organizationName>
+ <projectName>OSAM</projectName>
+ <canUpdateCopyright>true</canUpdateCopyright>
+ <canUpdateDescription>true</canUpdateDescription>
+ <canUpdateLicense>true</canUpdateLicense>
+ <emptyLineAfterHeader>true</emptyLineAfterHeader>
+ <verbose>false</verbose>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>first</id>
+ <goals>
+ <goal>update-file-header</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin-->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <!-- Generate POJOs from MSO json schema -->
+ <plugin>
+ <groupId>org.jsonschema2pojo</groupId>
+ <artifactId>jsonschema2pojo-maven-plugin</artifactId>
+ <version>0.4.23</version>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/resources/json/mso</sourceDirectory>
+ <targetPackage>org.onap.osam.domain.mso</targetPackage>
+ <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>${skipassembly}</skipAssembly>
+ <descriptors>
+ <descriptor>${basedir}/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!-- Build a jar with all the Java classes -->
+ <attachClasses>true</attachClasses>
+ <!-- Do not put any jars in the war -->
+ <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>2.2.4</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+ <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+ <includeOnlyProperties>
+ <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+ <includeOnlyProperty>^git.commit.message.short$</includeOnlyProperty>
+ <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+ </includeOnlyProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>com.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.att.eelf</groupId>
+ <artifactId>eelf-core</artifactId>
+ </dependency>
+ <!-- Mapper -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.joshworks.unirest</groupId>
+ <artifactId>unirest-java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.searchbox</groupId>
+ <artifactId>jest</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <exclusions>
+ <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </dependency>
+
+
+ <!-- Helpers -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.vavr</groupId>
+ <artifactId>vavr</artifactId>
+ </dependency>
+
+ <!-- SDK overlay war -->
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-overlay</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-common</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-analytics</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-workflow</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <!-- bridge to implement commons-logging using slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-jetty-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>osam-common</artifactId>
+ </dependency>
+
+ <!-- TEST-->
+ <dependency>
+ <groupId>com.xebialabs.restito</groupId>
+ <artifactId>restito</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.javacrumbs.json-unit</groupId>
+ <artifactId>json-unit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.bean-matchers</groupId>
+ <artifactId>bean-matchers</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/RelatedTo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/RelatedTo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/RelatedTo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/RelatedTo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClientInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClientInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClientInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiClientInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiGetVnfResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiGetVnfResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/AaiGetVnfResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiGetVnfResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponseWithRequestInfo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponseWithRequestInfo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponseWithRequestInfo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/AaiResponseWithRequestInfo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ExceptionWithRequestInfo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ExceptionWithRequestInfo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ExceptionWithRequestInfo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ExceptionWithRequestInfo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/OperationalEnvironment.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/OperationalEnvironment.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/OperationalEnvironment.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/OperationalEnvironment.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaClientInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaRestInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaRestInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/PombaRestInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/PombaRestInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ResponseWithRequestInfo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ResponseWithRequestInfo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ResponseWithRequestInfo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ResponseWithRequestInfo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstance.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstance.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstance.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstance.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstances.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstances.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstances.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstances.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstancesSearchResults.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstancesSearchResults.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstancesSearchResults.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceInstancesSearchResults.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscription.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscription.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscription.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscription.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscriptions.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscriptions.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscriptions.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/ServiceSubscriptions.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/Services.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/Services.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/Services.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/Services.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberAaiResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberAaiResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberAaiResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberAaiResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberData.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberData.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberData.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberData.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberFilteredResults.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberFilteredResults.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberFilteredResults.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberFilteredResults.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberListWithFilterData.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberListWithFilterData.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberListWithFilterData.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberListWithFilterData.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberWithFilter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberWithFilter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberWithFilter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/SubscriberWithFilter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/HttpClientBuilderException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/HttpClientBuilderException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/HttpClientBuilderException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/HttpClientBuilderException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidAAIResponseException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidAAIResponseException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidAAIResponseException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidAAIResponseException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidPropertyException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidPropertyException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidPropertyException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/InvalidPropertyException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/RoleParsingException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/RoleParsingException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/RoleParsingException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/exceptions/RoleParsingException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/AicZones.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/AicZones.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/AicZones.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/AicZones.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/Zone.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/Zone.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/Zone.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetAicZone/Zone.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetInstanceGroupsByCloudRegion.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetInstanceGroupsByCloudRegion.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetInstanceGroupsByCloudRegion.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetInstanceGroupsByCloudRegion.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetailsHelper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetailsHelper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetailsHelper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetailsHelper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetRelatedInstanceGroupsByVnfId.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetRelatedInstanceGroupsByVnfId.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetRelatedInstanceGroupsByVnfId.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/AaiGetRelatedInstanceGroupsByVnfId.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Collection.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Collection.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Collection.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Collection.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/InstanceGroup.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/InstanceGroup.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/InstanceGroup.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/InstanceGroup.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Network.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Network.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Network.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Network.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelatedToProperty.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelatedToProperty.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelatedToProperty.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelatedToProperty.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Relationship.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Relationship.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Relationship.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Relationship.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipData.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipData.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipData.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipData.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Result.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Result.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Result.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/Result.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/ServiceInstance.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/ServiceInstance.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/ServiceInstance.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetNetworkCollectionDetails/ServiceInstance.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfs/Pnf.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfs/Pnf.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfs/Pnf.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPnfs/Pnf.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPortMirroringSourcePorts.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPortMirroringSourcePorts.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPortMirroringSourcePorts.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetPortMirroringSourcePorts.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/GetServicesAAIRespone.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/Service.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/Service.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/Service.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetServicesRequestModel/Service.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetTenatns/GetTenantsResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetTenatns/GetTenantsResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetTenatns/GetTenantsResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiGetTenatns/GetTenantsResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiNodeQueryResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiNodeQueryResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiNodeQueryResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiNodeQueryResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiRelationResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiRelationResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiRelationResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/AaiRelationResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupInfo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupInfo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupInfo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupInfo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/InstanceGroupWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/LogicalLinkResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/LogicalLinkResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/LogicalLinkResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/LogicalLinkResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Model.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Model.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Model.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Model.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVer.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVer.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVer.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVer.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVers.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVers.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVers.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ModelVers.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntity.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntity.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntity.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntity.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntityResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntityResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntityResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/OwningEntityResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfResult.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfResult.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfResult.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PnfResult.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PortDetailsTranslator.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PortDetailsTranslator.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/PortDetailsTranslator.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/PortDetailsTranslator.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Project.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Project.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Project.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Project.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ProjectResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ProjectResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ProjectResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ProjectResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Properties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Properties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Properties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Properties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedTo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedTo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedTo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedTo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedToProperty.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedToProperty.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedToProperty.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelatedToProperty.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Relationship.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Relationship.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Relationship.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Relationship.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipData.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipData.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipData.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipData.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/RelationshipList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ResourceType.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ResourceType.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ResourceType.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ResourceType.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Result.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Result.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Result.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Result.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstance.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstance.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstance.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstance.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstances.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstances.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstances.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceInstances.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceRelationships.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceRelationships.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceRelationships.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceRelationships.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceSubscription.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceSubscription.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceSubscription.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/ServiceSubscription.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Services.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Services.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/Services.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/Services.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/SimpleResult.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/SimpleResult.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/SimpleResult.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/SimpleResult.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/model/VnfResult.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/VnfResult.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/model/VnfResult.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/model/VnfResult.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIRestInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIRestInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIRestInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/AAIRestInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProvider.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProvider.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProvider.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProvider.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpClientMode.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpClientMode.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpClientMode.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpClientMode.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsAuthClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsAuthClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsAuthClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsAuthClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsComponentsClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsComponentsClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsComponentsClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/HttpsComponentsClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/JettyObfuscationConversionCommandLineUtil.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/JettyObfuscationConversionCommandLineUtil.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/JettyObfuscationConversionCommandLineUtil.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/JettyObfuscationConversionCommandLineUtil.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SSLContextProvider.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SSLContextProvider.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/SSLContextProvider.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SSLContextProvider.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/ServletRequestHelper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/ServletRequestHelper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/ServletRequestHelper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/ServletRequestHelper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SystemPropertyHelper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SystemPropertyHelper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/aai/util/SystemPropertyHelper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/aai/util/SystemPropertyHelper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/client/HttpBasicClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/HttpBasicClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/client/HttpBasicClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/HttpBasicClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/client/HttpsBasicClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/HttpsBasicClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/client/HttpsBasicClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/HttpsBasicClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClient.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClient.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClient.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClient.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClientInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClientInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClientInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/client/SyncRestClientInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/AaiController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AaiController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/AaiController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AaiController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncControllerForTests.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncControllerForTests.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncControllerForTests.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncControllerForTests.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncInstantiationController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncInstantiationController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncInstantiationController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/AsyncInstantiationController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/ControllersUtils.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/ControllersUtils.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/ControllersUtils.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/ControllersUtils.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/FeatureTogglingController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/FeatureTogglingController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/FeatureTogglingController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/FeatureTogglingController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/LoggerController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/LoggerController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/LoggerController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/LoggerController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoConfig.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoConfig.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoConfig.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoConfig.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/MsoController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerAccessPodController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerAccessPodController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerAccessPodController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerAccessPodController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerDeviceController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerDeviceController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerDeviceController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerDeviceController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerServiceController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerServiceController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerServiceController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerServiceController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerTopologyController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerTopologyController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerTopologyController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OnapEnablerTopologyController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/OsamCoreRestrictedBaseController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OsamCoreRestrictedBaseController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/OsamCoreRestrictedBaseController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/OsamCoreRestrictedBaseController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/PodDemoController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/PodDemoController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/PodDemoController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/PodDemoController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/ViewLogController.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/ViewLogController.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/ViewLogController.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/ViewLogController.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/controllers/WebConfig.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/WebConfig.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/controllers/WebConfig.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/controllers/WebConfig.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/dao/FnAppDoaImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/dao/FnAppDoaImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/dao/FnAppDoaImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/dao/FnAppDoaImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/dao/ProfileDao.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/dao/ProfileDao.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/dao/ProfileDao.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/dao/ProfileDao.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/DbFailureUncheckedException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/DbFailureUncheckedException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/DbFailureUncheckedException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/DbFailureUncheckedException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/GenericUncheckedException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/GenericUncheckedException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/GenericUncheckedException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/GenericUncheckedException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/MaxRetriesException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/MaxRetriesException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/MaxRetriesException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/MaxRetriesException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/NotFoundException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/NotFoundException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/NotFoundException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/NotFoundException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/OperationNotAllowedException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/OperationNotAllowedException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/OperationNotAllowedException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/OperationNotAllowedException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/exceptions/VidServiceUnavailableException.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/VidServiceUnavailableException.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/exceptions/VidServiceUnavailableException.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/exceptions/VidServiceUnavailableException.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/factories/MsoRequestFactory.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/factories/MsoRequestFactory.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/factories/MsoRequestFactory.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/factories/MsoRequestFactory.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/filters/ClientCredentialsFilter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/ClientCredentialsFilter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/filters/ClientCredentialsFilter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/ClientCredentialsFilter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/filters/PromiseEcompRequestIdFilter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/PromiseEcompRequestIdFilter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/filters/PromiseEcompRequestIdFilter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/PromiseEcompRequestIdFilter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/filters/TempFilterForCORS.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/TempFilterForCORS.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/filters/TempFilterForCORS.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/filters/TempFilterForCORS.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/Job.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/Job.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/Job.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/Job.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/JobAdapter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobAdapter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/JobAdapter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobAdapter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/JobCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/JobCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/JobType.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobType.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/JobType.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobType.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/JobsBrokerService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobsBrokerService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/JobsBrokerService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/JobsBrokerService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/NextCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/NextCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/NextCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/NextCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/AggregateStateCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/AggregateStateCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/AggregateStateCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/AggregateStateCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/HttpCallCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/InProgressStatusCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/InProgressStatusCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/InProgressStatusCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/InProgressStatusCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/JobCommandFactory.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/NoOpCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/NoOpCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/NoOpCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/NoOpCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/command/ServiceInstantiationCommand.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/ServiceInstantiationCommand.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/command/ServiceInstantiationCommand.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/command/ServiceInstantiationCommand.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobAdapterImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobAdapterImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobAdapterImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobAdapterImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobDaoImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobDaoImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobDaoImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobDaoImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobWorker.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobWorker.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobWorker.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobWorker.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobsBrokerServiceInDatabaseImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobsBrokerServiceInDatabaseImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobsBrokerServiceInDatabaseImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/job/impl/JobsBrokerServiceInDatabaseImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/logging/VidLoggerAspect.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/logging/VidLoggerAspect.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/logging/VidLoggerAspect.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/logging/VidLoggerAspect.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameterOption.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameterOption.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameterOption.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CategoryParameterOption.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/CommandProperty.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CommandProperty.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/CommandProperty.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/CommandProperty.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionTranslator.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionTranslator.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionTranslator.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ExceptionTranslator.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/GitRepositoryState.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/GitRepositoryState.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/GitRepositoryState.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/GitRepositoryState.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/GroupProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/GroupProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/GroupProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/GroupProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/JobAuditStatus.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobAuditStatus.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/JobAuditStatus.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobAuditStatus.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/JobBulk.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobBulk.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/JobBulk.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobBulk.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/JobModel.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobModel.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/JobModel.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/JobModel.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ListOfErrorsResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ListOfErrorsResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ListOfErrorsResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ListOfErrorsResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ModelConstants.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ModelConstants.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ModelConstants.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ModelConstants.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ModelUtil.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ModelUtil.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ModelUtil.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ModelUtil.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/MsoExceptionResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/MsoExceptionResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/MsoExceptionResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/MsoExceptionResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/NameCounter.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NameCounter.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/NameCounter.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NameCounter.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollection.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollection.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollection.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollection.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollectionProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollectionProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollectionProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/NetworkCollectionProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/PombaRequest.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/PombaRequest.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/PombaRequest.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/PombaRequest.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/ServiceInstance.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/ServiceInstance.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/ServiceInstance.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/PombaInstance/ServiceInstance.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ProxyResponse.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ProxyResponse.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ProxyResponse.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ProxyResponse.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/RequestReferencesContainer.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/RequestReferencesContainer.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/RequestReferencesContainer.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/RequestReferencesContainer.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/Resource.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Resource.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/Resource.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Resource.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/Result.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Result.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/Result.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Result.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInfo.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInfo.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInfo.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInfo.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInstanceSearchResult.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInstanceSearchResult.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInstanceSearchResult.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/ServiceInstanceSearchResult.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/Subscriber.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Subscriber.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/Subscriber.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Subscriber.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/SubscriberList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/SubscriberList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/SubscriberList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/SubscriberList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VNFDao.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VNFDao.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VNFDao.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VNFDao.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VersionByInvariantIdsRequest.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VersionByInvariantIdsRequest.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VersionByInvariantIdsRequest.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VersionByInvariantIdsRequest.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroup.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroup.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroup.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroup.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroupProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroupProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroupProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VfcInstanceGroupProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VidBaseEntity.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VidBaseEntity.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VidBaseEntity.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VidBaseEntity.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/VidWorkflow.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VidWorkflow.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/VidWorkflow.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/VidWorkflow.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/Workflow.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Workflow.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/Workflow.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/Workflow.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ErrorMetadata.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ErrorMetadata.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/probes/ErrorMetadata.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ErrorMetadata.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ExternalComponentStatus.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ExternalComponentStatus.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/probes/ExternalComponentStatus.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/ExternalComponentStatus.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/probes/HttpRequestMetadata.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/HttpRequestMetadata.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/probes/HttpRequestMetadata.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/HttpRequestMetadata.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/probes/StatusMetadata.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/StatusMetadata.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/probes/StatusMetadata.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/probes/StatusMetadata.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/ServiceInstantiation.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/ServiceInstantiation.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/ServiceInstantiation.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/ServiceInstantiation.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/VfModule.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/VfModule.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/VfModule.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/VfModule.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/Vnf.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/Vnf.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/Vnf.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/model/serviceInstantiation/Vnf.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogic.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogic.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogic.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogic.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogicImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogicImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogicImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoBusinessLogicImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper2.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper2.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper2.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapper2.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapperInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapperInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapperInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoResponseWrapperInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoUtil.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoUtil.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/MsoUtil.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/MsoUtil.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/RestMsoImplementation.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/RestMsoImplementation.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/RestMsoImplementation.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/RestMsoImplementation.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/RestObject.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/RestObject.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/RestObject.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/RestObject.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/model/ServiceInstantiationRequestDetails.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/model/ServiceInstantiationRequestDetails.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/model/ServiceInstantiationRequestDetails.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/model/ServiceInstantiationRequestDetails.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/AsyncRequestStatus.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/AsyncRequestStatus.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/AsyncRequestStatus.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/AsyncRequestStatus.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/MsoRestClientNew.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/MsoRestClientNew.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/MsoRestClientNew.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/MsoRestClientNew.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/OperationalEnvironment/OperationEnvironmentRequestDetails.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/OperationalEnvironment/OperationEnvironmentRequestDetails.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/OperationalEnvironment/OperationEnvironmentRequestDetails.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/OperationalEnvironment/OperationEnvironmentRequestDetails.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstance.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstance.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstance.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstance.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstanceWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstanceWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstanceWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedInstanceWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedModel.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedModel.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedModel.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RelatedModel.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Request.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Request.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Request.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Request.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetails.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetails.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetails.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetails.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetailsWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetailsWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetailsWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestDetailsWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestParameters.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestParameters.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestParameters.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestParameters.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RequestWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Response.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Response.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Response.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Response.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RestInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RestInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RestInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/RestInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Task.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Task.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Task.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/Task.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/TaskList.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/TaskList.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/mso/rest/TaskList.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/mso/rest/TaskList.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyResponseWrapper.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyResponseWrapper.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyResponseWrapper.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyResponseWrapper.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInt.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInt.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInt.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInt.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceFactory.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceFactory.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceFactory.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceFactory.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceIfc.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceIfc.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceIfc.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyRestInterfaceIfc.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyUtil.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyUtil.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyUtil.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/PolicyUtil.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/RestObject.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/RestObject.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/RestObject.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/RestObject.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/policy/rest/RequestDetails.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/rest/RequestDetails.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/policy/rest/RequestDetails.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/policy/rest/RequestDetails.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/properties/AsdcClientConfiguration.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/AsdcClientConfiguration.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/properties/AsdcClientConfiguration.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/AsdcClientConfiguration.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/properties/Features.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/Features.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/properties/Features.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/Features.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/properties/FeaturesTogglingConfiguration.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/FeaturesTogglingConfiguration.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/properties/FeaturesTogglingConfiguration.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/FeaturesTogglingConfiguration.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/properties/VidProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/VidProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/properties/VidProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/properties/VidProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/roles/EcompRole.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/EcompRole.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/roles/EcompRole.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/EcompRole.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/roles/Role.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/Role.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/roles/Role.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/Role.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleProvider.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleProvider.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/roles/RoleProvider.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleProvider.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleValidator.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleValidator.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/roles/RoleValidator.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/roles/RoleValidator.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObject.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObject.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObject.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObject.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObjects/RestObject.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObjects/RestObject.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObjects/RestObject.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/RestObjects/RestObject.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerProperties.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerProperties.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerProperties.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerProperties.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterface.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterface.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterface.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterface.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterfaceIfc.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterfaceIfc.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterfaceIfc.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/scheduler/SchedulerRestInterfaceIfc.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/AaiServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AaiServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/AaiServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AaiServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/AsyncInstantiationBusinessLogicImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AsyncInstantiationBusinessLogicImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/AsyncInstantiationBusinessLogicImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AsyncInstantiationBusinessLogicImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/AuditServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AuditServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/AuditServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/AuditServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/BulkInstantiationServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/BulkInstantiationServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/BulkInstantiationServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/BulkInstantiationServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/CsvServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/CsvServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/CsvServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/CsvServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IAaiService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAaiService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IAaiService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAaiService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IAsyncInstantiationBusinessLogic.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAsyncInstantiationBusinessLogic.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IAsyncInstantiationBusinessLogic.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAsyncInstantiationBusinessLogic.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IAuditService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAuditService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IAuditService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IAuditService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IBulkInstantiationService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IBulkInstantiationService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IBulkInstantiationService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IBulkInstantiationService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/ICsvService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/ICsvService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/ICsvService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/ICsvService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IPodService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IPodService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IPodService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IPodService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IPombaService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IPombaService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IPombaService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IPombaService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IRoleGeneratorService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IRoleGeneratorService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IRoleGeneratorService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IRoleGeneratorService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/IWorkflowService.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IWorkflowService.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/IWorkflowService.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/IWorkflowService.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/PombaServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/PombaServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/PombaServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/PombaServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/RoleGenaratorServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/RoleGenaratorServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/RoleGenaratorServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/RoleGenaratorServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/services/WorkflowServiceImpl.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/WorkflowServiceImpl.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/services/WorkflowServiceImpl.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/services/WorkflowServiceImpl.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/utils/DaoUtils.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/DaoUtils.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/utils/DaoUtils.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/DaoUtils.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/utils/Intersection.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Intersection.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/utils/Intersection.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Intersection.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/utils/Logging.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Logging.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/utils/Logging.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Logging.java
diff --git a/onap-enabler-be/src/main/java/org/onap/osam/utils/Streams.java b/onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Streams.java
similarity index 100%
rename from onap-enabler-be/src/main/java/org/onap/osam/utils/Streams.java
rename to onap-enabler/onap-enabler-be/src/main/java/org/onap/osam/utils/Streams.java
diff --git a/onap-enabler-be/src/main/resources/aai_config_instance_view_edit.json b/onap-enabler/onap-enabler-be/src/main/resources/aai_config_instance_view_edit.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/aai_config_instance_view_edit.json
rename to onap-enabler/onap-enabler-be/src/main/resources/aai_config_instance_view_edit.json
diff --git a/onap-enabler-be/src/main/resources/aai_get_node_template_instances.json b/onap-enabler/onap-enabler-be/src/main/resources/aai_get_node_template_instances.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/aai_get_node_template_instances.json
rename to onap-enabler/onap-enabler-be/src/main/resources/aai_get_node_template_instances.json
diff --git a/onap-enabler-be/src/main/resources/catalog.json b/onap-enabler/onap-enabler-be/src/main/resources/catalog.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/catalog.json
rename to onap-enabler/onap-enabler-be/src/main/resources/catalog.json
diff --git a/onap-enabler-be/src/main/resources/json/mso/cloudConfiguration b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/cloudConfiguration
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/cloudConfiguration
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/cloudConfiguration
diff --git a/onap-enabler-be/src/main/resources/json/mso/instanceIds b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/instanceIds
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/instanceIds
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/instanceIds
diff --git a/onap-enabler-be/src/main/resources/json/mso/modelInfo b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/modelInfo
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/modelInfo
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/modelInfo
diff --git a/onap-enabler-be/src/main/resources/json/mso/relatedInstance b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/relatedInstance
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/relatedInstance
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/relatedInstance
diff --git a/onap-enabler-be/src/main/resources/json/mso/relatedModel b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/relatedModel
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/relatedModel
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/relatedModel
diff --git a/onap-enabler-be/src/main/resources/json/mso/request b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/request
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/request
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/request
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestDetails b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestDetails
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestDetails
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestDetails
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestError b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestError
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestError
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestError
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestInfo b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestInfo
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestInfo
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestInfo
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestParameters b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestParameters
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestParameters
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestParameters
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestReferences b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestReferences
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestReferences
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestReferences
diff --git a/onap-enabler-be/src/main/resources/json/mso/requestStatus b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestStatus
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/requestStatus
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/requestStatus
diff --git a/onap-enabler-be/src/main/resources/json/mso/response b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/response
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/response
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/response
diff --git a/onap-enabler-be/src/main/resources/json/mso/subscriberInfo b/onap-enabler/onap-enabler-be/src/main/resources/json/mso/subscriberInfo
similarity index 100%
rename from onap-enabler-be/src/main/resources/json/mso/subscriberInfo
rename to onap-enabler/onap-enabler-be/src/main/resources/json/mso/subscriberInfo
diff --git a/onap-enabler-be/src/main/resources/mso_complete_manual_task.json b/onap-enabler/onap-enabler-be/src/main/resources/mso_complete_manual_task.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/mso_complete_manual_task.json
rename to onap-enabler/onap-enabler-be/src/main/resources/mso_complete_manual_task.json
diff --git a/onap-enabler-be/src/main/resources/mso_create_instance_response.json b/onap-enabler/onap-enabler-be/src/main/resources/mso_create_instance_response.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/mso_create_instance_response.json
rename to onap-enabler/onap-enabler-be/src/main/resources/mso_create_instance_response.json
diff --git a/onap-enabler-be/src/main/resources/mso_get_manual_task_by_request_id.json b/onap-enabler/onap-enabler-be/src/main/resources/mso_get_manual_task_by_request_id.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/mso_get_manual_task_by_request_id.json
rename to onap-enabler/onap-enabler-be/src/main/resources/mso_get_manual_task_by_request_id.json
diff --git a/onap-enabler-be/src/main/resources/mso_get_orchestration_requests.json b/onap-enabler/onap-enabler-be/src/main/resources/mso_get_orchestration_requests.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/mso_get_orchestration_requests.json
rename to onap-enabler/onap-enabler-be/src/main/resources/mso_get_orchestration_requests.json
diff --git a/onap-enabler-be/src/main/resources/owning-entity-properties.JSON b/onap-enabler/onap-enabler-be/src/main/resources/owning-entity-properties.JSON
similarity index 100%
rename from onap-enabler-be/src/main/resources/owning-entity-properties.JSON
rename to onap-enabler/onap-enabler-be/src/main/resources/owning-entity-properties.JSON
diff --git a/onap-enabler-be/src/main/resources/roles.json b/onap-enabler/onap-enabler-be/src/main/resources/roles.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/roles.json
rename to onap-enabler/onap-enabler-be/src/main/resources/roles.json
diff --git a/onap-enabler-be/src/main/resources/sdcservices.json b/onap-enabler/onap-enabler-be/src/main/resources/sdcservices.json
similarity index 100%
rename from onap-enabler-be/src/main/resources/sdcservices.json
rename to onap-enabler/onap-enabler-be/src/main/resources/sdcservices.json
diff --git a/onap-enabler-be/src/main/resources/test.csv b/onap-enabler/onap-enabler-be/src/main/resources/test.csv
similarity index 100%
rename from onap-enabler-be/src/main/resources/test.csv
rename to onap-enabler/onap-enabler-be/src/main/resources/test.csv
diff --git a/onap-enabler-be/src/main/webapp/META-INF/MANIFEST.MF b/onap-enabler/onap-enabler-be/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from onap-enabler-be/src/main/webapp/META-INF/MANIFEST.MF
rename to onap-enabler/onap-enabler-be/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/onap-enabler-be/src/main/webapp/WEB-INF/conf/dev.features.properties b/onap-enabler/onap-enabler-be/src/main/webapp/WEB-INF/conf/dev.features.properties
similarity index 100%
rename from onap-enabler-be/src/main/webapp/WEB-INF/conf/dev.features.properties
rename to onap-enabler/onap-enabler-be/src/main/webapp/WEB-INF/conf/dev.features.properties
diff --git a/onap-enabler-be/src/main/webapp/WEB-INF/conf/features.properties b/onap-enabler/onap-enabler-be/src/main/webapp/WEB-INF/conf/features.properties
similarity index 100%
rename from onap-enabler-be/src/main/webapp/WEB-INF/conf/features.properties
rename to onap-enabler/onap-enabler-be/src/main/webapp/WEB-INF/conf/features.properties
diff --git a/onap-enabler-be/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
diff --git a/onap-enabler-be/src/test/java/org/onap/fusionapp/controller/NetMapTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/fusionapp/controller/NetMapTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/fusionapp/controller/NetMapTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/fusionapp/controller/NetMapTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/RelatedToTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/RelatedToTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/RelatedToTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/RelatedToTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiClientTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiClientTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/AaiClientTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiClientTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiGetVnfResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiGetVnfResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/AaiGetVnfResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/AaiGetVnfResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/OperationalEnvironmentTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/OperationalEnvironmentTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/OperationalEnvironmentTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/OperationalEnvironmentTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/ServicePropertiesTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/ServicePropertiesTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/ServicePropertiesTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/ServicePropertiesTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberAaiResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberAaiResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberAaiResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberAaiResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberFilteredResultsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberFilteredResultsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberFilteredResultsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberFilteredResultsTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberWithFilterTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberWithFilterTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberWithFilterTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/SubscriberWithFilterTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/VnfResultTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/VnfResultTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/VnfResultTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/VnfResultTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentListTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentListTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentListTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetOperationalEnvironments/OperationalEnvironmentListTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfs/PnfTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfs/PnfTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfs/PnfTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiGetPnfs/PnfTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiRelationResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiRelationResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiRelationResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/AaiRelationResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/GetServiceModelsByDistributionStatusResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/LogicalLinkResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/LogicalLinkResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/LogicalLinkResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/LogicalLinkResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVersTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVersTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVersTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ModelVersTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/OwningEntityTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/OwningEntityTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/OwningEntityTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/OwningEntityTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfPropertiesTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfPropertiesTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfPropertiesTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfPropertiesTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfResultTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfResultTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfResultTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/PnfResultTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ProjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelatedToPropertyTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelatedToPropertyTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelatedToPropertyTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelatedToPropertyTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipDataTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipDataTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipDataTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipDataTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/RelationshipTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ResultTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ResultTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ResultTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ResultTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ServiceRelationshipsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ServiceRelationshipsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/model/ServiceRelationshipsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/model/ServiceRelationshipsTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/util/AAIRestInterfaceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/AAIRestInterfaceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/util/AAIRestInterfaceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/AAIRestInterfaceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProviderTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProviderTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProviderTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/CustomJacksonJaxBJsonProviderTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/util/HttpsAuthClientTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/HttpsAuthClientTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/util/HttpsAuthClientTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/HttpsAuthClientTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/util/ParametrizedAAIRestInterfaceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/ParametrizedAAIRestInterfaceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/util/ParametrizedAAIRestInterfaceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/ParametrizedAAIRestInterfaceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/aai/util/SingleAAIRestInterfaceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/SingleAAIRestInterfaceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/aai/util/SingleAAIRestInterfaceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/aai/util/SingleAAIRestInterfaceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/bl/AaiServiceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/bl/AaiServiceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/bl/AaiServiceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/bl/AaiServiceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/client/HttpBasicClientTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/HttpBasicClientTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/client/HttpBasicClientTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/HttpBasicClientTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/client/HttpsBasicClientTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/HttpsBasicClientTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/client/HttpsBasicClientTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/HttpsBasicClientTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpServerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpServerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpServerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpServerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpsServerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpsServerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpsServerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientForHttpsServerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientModel.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientModel.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientModel.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/client/SyncRestClientModel.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/config/DataSourceConfig.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/DataSourceConfig.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/config/DataSourceConfig.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/DataSourceConfig.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/config/JobAdapterConfig.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/JobAdapterConfig.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/config/JobAdapterConfig.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/JobAdapterConfig.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/config/JobCommandsConfigWithMockedMso.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/JobCommandsConfigWithMockedMso.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/config/JobCommandsConfigWithMockedMso.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/JobCommandsConfigWithMockedMso.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/config/MockedAaiClientAndFeatureManagerConfig.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/MockedAaiClientAndFeatureManagerConfig.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/config/MockedAaiClientAndFeatureManagerConfig.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/config/MockedAaiClientAndFeatureManagerConfig.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java
similarity index 98%
rename from onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java
index 6ef2fcc..6ce9bde 100644
--- a/onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java
+++ b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/ClientCredentialsFilterTest.java
@@ -16,7 +16,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- */
+ *//*
+
@@ -82,7 +83,7 @@
Assert.assertFalse(filter.verifyClientCredentials(actualAuth, expectedAuth));
}
- //@Test(dataProvider = "clientVerified")
+ @Test(dataProvider = "clientVerified")
public void notAuthorized_return401(Boolean clientVerified) throws IOException, ServletException {
ClientCredentialsFilter filter = Mockito.mock(ClientCredentialsFilter.class);
HttpServletResponse response = Mockito.mock(HttpServletResponse.class);
@@ -109,3 +110,4 @@
}
+*/
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controller/LocalWebConfig.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/LocalWebConfig.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controller/LocalWebConfig.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/LocalWebConfig.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controller/MsoControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/MsoControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controller/MsoControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/MsoControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controller/PromiseEcompRequestIdFilterTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/PromiseEcompRequestIdFilterTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controller/PromiseEcompRequestIdFilterTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controller/PromiseEcompRequestIdFilterTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/AaiControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/AaiControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/AaiControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/AaiControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/HealthCheckControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/HealthCheckControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/HealthCheckControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/HealthCheckControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/LocalWebConfig.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/LocalWebConfig.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/LocalWebConfig.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/LocalWebConfig.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/LoggerControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/LoggerControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/LoggerControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/LoggerControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerNewTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerNewTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerNewTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerNewTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/MsoControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/PromiseEcompRequestIdFilterTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/PromiseEcompRequestIdFilterTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/PromiseEcompRequestIdFilterTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/PromiseEcompRequestIdFilterTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/VidControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/VidControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/VidControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/VidControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/controllers/ViewEditSubControllerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/ViewEditSubControllerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/controllers/ViewEditSubControllerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/controllers/ViewEditSubControllerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/dao/FnAppDoaImplTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/dao/FnAppDoaImplTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/dao/FnAppDoaImplTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/dao/FnAppDoaImplTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/factories/MsoRequestFactoryTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/factories/MsoRequestFactoryTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/factories/MsoRequestFactoryTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/factories/MsoRequestFactoryTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/integrationTest/AaiIntegrationTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/integrationTest/AaiIntegrationTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/integrationTest/AaiIntegrationTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/integrationTest/AaiIntegrationTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/logging/VidLoggerAspectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/logging/VidLoggerAspectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/logging/VidLoggerAspectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/logging/VidLoggerAspectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterOptionTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterOptionTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterOptionTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterOptionTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/CategoryParameterTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/ExceptionResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ExceptionResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/ExceptionResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ExceptionResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/ListOfErrorsResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ListOfErrorsResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/ListOfErrorsResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ListOfErrorsResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/ModelUtilTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ModelUtilTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/ModelUtilTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ModelUtilTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/RequestReferencesContainerTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/RequestReferencesContainerTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/RequestReferencesContainerTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/RequestReferencesContainerTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/ResultTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ResultTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/ResultTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ResultTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/ServiceInstanceSearchResultTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ServiceInstanceSearchResultTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/ServiceInstanceSearchResultTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/ServiceInstanceSearchResultTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/VNFDaoTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/VNFDaoTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/VNFDaoTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/VNFDaoTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/VidWorkflowTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/VidWorkflowTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/VidWorkflowTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/VidWorkflowTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/WorkflowTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/WorkflowTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/WorkflowTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/WorkflowTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/model/oeModel.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/oeModel.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/model/oeModel.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/model/oeModel.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicImplTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicImplTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicImplTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicImplTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoBusinessLogicTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapper2Test.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapper2Test.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapper2Test.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapper2Test.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoResponseWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoUtilTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoUtilTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/MsoUtilTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/MsoUtilTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/RestMsoImplementationTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/RestMsoImplementationTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/RestMsoImplementationTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/RestMsoImplementationTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/RestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/RestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/RestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/RestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/AsyncRequestStatusTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/AsyncRequestStatusTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/AsyncRequestStatusTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/AsyncRequestStatusTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientNewTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientNewTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientNewTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientNewTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTestUtil.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTestUtil.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTestUtil.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/MsoRestClientTestUtil.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/OutgoingRequestIdTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/OutgoingRequestIdTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/OutgoingRequestIdTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/OutgoingRequestIdTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedInstanceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedInstanceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedInstanceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedInstanceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedModelTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedModelTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedModelTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RelatedModelTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestDetailsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestDetailsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestDetailsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestDetailsTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestListTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestListTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestListTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestListTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/RequestWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/ResponseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/ResponseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/ResponseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/ResponseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskListTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskListTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskListTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskListTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/mso/rest/TaskTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyResponseWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyResponseWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyResponseWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyResponseWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestIntTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestIntTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestIntTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestIntTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceFactoryTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceFactoryTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceFactoryTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceFactoryTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyRestInterfaceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyUtilTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyUtilTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyUtilTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/PolicyUtilTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/RestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/RestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/RestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/RestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/policy/rest/RequestDetailsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/rest/RequestDetailsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/policy/rest/RequestDetailsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/policy/rest/RequestDetailsTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/properties/VidPropertiesTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/properties/VidPropertiesTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/properties/VidPropertiesTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/properties/VidPropertiesTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleProviderTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleProviderTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/roles/RoleProviderTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleProviderTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/roles/RoleTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleValidatorTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleValidatorTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/roles/RoleValidatorTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/roles/RoleValidatorTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/GetTimeSlotsRestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/GetTimeSlotsRestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/GetTimeSlotsRestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/GetTimeSlotsRestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostCreateNewVnfRestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostCreateNewVnfRestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostCreateNewVnfRestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostCreateNewVnfRestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostSubmitVnfChangeRestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostSubmitVnfChangeRestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostSubmitVnfChangeRestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/PostSubmitVnfChangeRestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/RestObjectTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/RestObjectTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/RestObjectTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/RestObjects/RestObjectTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostCreateNewVnfWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostCreateNewVnfWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostCreateNewVnfWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostCreateNewVnfWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostSubmitVnfChangeTimeSlotsWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostSubmitVnfChangeTimeSlotsWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostSubmitVnfChangeTimeSlotsWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/PostSubmitVnfChangeTimeSlotsWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/SchedulerResponseWrapperTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/SchedulerResponseWrapperTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/SchedulerResponseWrapperTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerResponseWrappers/SchedulerResponseWrapperTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerRestInterfaceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerRestInterfaceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerRestInterfaceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/SchedulerRestInterfaceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/scheduler/rest/RequestDetailsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/rest/RequestDetailsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/scheduler/rest/RequestDetailsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/scheduler/rest/RequestDetailsTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/AaiServiceImplTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AaiServiceImplTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/AaiServiceImplTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AaiServiceImplTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBaseTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBaseTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBaseTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBaseTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBusinessLogicTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBusinessLogicTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBusinessLogicTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/AsyncInstantiationBusinessLogicTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/CsvServiceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/CsvServiceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/CsvServiceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/CsvServiceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/JobsBrokerServiceTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/JobsBrokerServiceTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/JobsBrokerServiceTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/JobsBrokerServiceTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/PortDetailsTranslatorTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/PortDetailsTranslatorTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/PortDetailsTranslatorTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/PortDetailsTranslatorTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/RoleGenaratorServiceImplTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/RoleGenaratorServiceImplTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/RoleGenaratorServiceImplTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/RoleGenaratorServiceImplTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/services/WorkflowServiceImplTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/WorkflowServiceImplTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/services/WorkflowServiceImplTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/services/WorkflowServiceImplTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/testUtils/IntersectionTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/IntersectionTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/testUtils/IntersectionTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/IntersectionTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/testUtils/RegExMatcher.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/RegExMatcher.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/testUtils/RegExMatcher.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/RegExMatcher.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/testUtils/StubServerUtil.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/StubServerUtil.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/testUtils/StubServerUtil.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/StubServerUtil.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java
similarity index 98%
rename from onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java
index 64c985b..854cdbb 100644
--- a/onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java
+++ b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/testUtils/TestUtils.java
@@ -42,7 +42,6 @@
import java.util.Iterator;
import java.util.List;
-import static fj.parser.Parser.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
@@ -82,7 +81,7 @@
}
}
else {
- fail("expected: " + expectedValue + " got:" + actualValue);
+ Assert.fail("expected: " + expectedValue + " got:" + actualValue);
}
}
else {
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingTest.java
diff --git a/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingUtilsTest.java b/onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingUtilsTest.java
similarity index 100%
rename from onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingUtilsTest.java
rename to onap-enabler/onap-enabler-be/src/test/java/org/onap/osam/utils/LoggingUtilsTest.java
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/asdc.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/asdc.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/asdc.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/asdc.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/quartz.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/quartz.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/quartz.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/quartz.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/raptor.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_app_fusion.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_app_fusion.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_app_fusion.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_app_fusion.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_db_fusion.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_db_fusion.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_db_fusion.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_db_fusion.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_pdf.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_pdf.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_pdf.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/raptor_pdf.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/sql.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/sql.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/sql.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/sql.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties.cml b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties.cml
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties.cml
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/conf/system.properties.cml
diff --git a/onap-enabler-be/src/test/resources/WEB-INF/fusion/conf/fusion.properties b/onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/fusion/conf/fusion.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/WEB-INF/fusion/conf/fusion.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/WEB-INF/fusion/conf/fusion.properties
diff --git a/onap-enabler-be/src/test/resources/asdc.properties b/onap-enabler/onap-enabler-be/src/test/resources/asdc.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/asdc.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/asdc.properties
diff --git a/onap-enabler-be/src/test/resources/cr-csar.JSON b/onap-enabler/onap-enabler-be/src/test/resources/cr-csar.JSON
similarity index 100%
rename from onap-enabler-be/src/test/resources/cr-csar.JSON
rename to onap-enabler/onap-enabler-be/src/test/resources/cr-csar.JSON
diff --git a/onap-enabler-be/src/test/resources/csv_files/csv_to_json.csv b/onap-enabler/onap-enabler-be/src/test/resources/csv_files/csv_to_json.csv
similarity index 100%
rename from onap-enabler-be/src/test/resources/csv_files/csv_to_json.csv
rename to onap-enabler/onap-enabler-be/src/test/resources/csv_files/csv_to_json.csv
diff --git a/onap-enabler-be/src/test/resources/csv_files/empty_file.csv b/onap-enabler/onap-enabler-be/src/test/resources/csv_files/empty_file.csv
similarity index 100%
rename from onap-enabler-be/src/test/resources/csv_files/empty_file.csv
rename to onap-enabler/onap-enabler-be/src/test/resources/csv_files/empty_file.csv
diff --git a/onap-enabler-be/src/test/resources/csv_files/missing_content.csv b/onap-enabler/onap-enabler-be/src/test/resources/csv_files/missing_content.csv
similarity index 100%
rename from onap-enabler-be/src/test/resources/csv_files/missing_content.csv
rename to onap-enabler/onap-enabler-be/src/test/resources/csv_files/missing_content.csv
diff --git a/onap-enabler-be/src/test/resources/csv_files/missing_values.csv b/onap-enabler/onap-enabler-be/src/test/resources/csv_files/missing_values.csv
similarity index 100%
rename from onap-enabler-be/src/test/resources/csv_files/missing_values.csv
rename to onap-enabler/onap-enabler-be/src/test/resources/csv_files/missing_values.csv
diff --git a/onap-enabler-be/src/test/resources/csv_files/one_line.csv b/onap-enabler/onap-enabler-be/src/test/resources/csv_files/one_line.csv
similarity index 100%
rename from onap-enabler-be/src/test/resources/csv_files/one_line.csv
rename to onap-enabler/onap-enabler-be/src/test/resources/csv_files/one_line.csv
diff --git a/onap-enabler-be/src/test/resources/git.properties b/onap-enabler/onap-enabler-be/src/test/resources/git.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/git.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/git.properties
diff --git a/onap-enabler-be/src/test/resources/mso.properties b/onap-enabler/onap-enabler-be/src/test/resources/mso.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/mso.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/mso.properties
diff --git a/onap-enabler-be/src/test/resources/msoRequest.json b/onap-enabler/onap-enabler-be/src/test/resources/msoRequest.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/msoRequest.json
rename to onap-enabler/onap-enabler-be/src/test/resources/msoRequest.json
diff --git a/onap-enabler-be/src/test/resources/objectconfig.properties b/onap-enabler/onap-enabler-be/src/test/resources/objectconfig.properties
similarity index 100%
rename from onap-enabler-be/src/test/resources/objectconfig.properties
rename to onap-enabler/onap-enabler-be/src/test/resources/objectconfig.properties
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_unique_names.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/mso_request_create_configuration.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/mso_request_create_configuration.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/mso_request_create_configuration.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/mso_request_create_configuration.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/mso_service_instantiation.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/mso_service_instantiation.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/mso_service_instantiation.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/mso_service_instantiation.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayload.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
diff --git a/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json b/onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
rename to onap-enabler/onap-enabler-be/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
diff --git a/onap-enabler-be/src/test/resources/pnf.csar b/onap-enabler/onap-enabler-be/src/test/resources/pnf.csar
similarity index 100%
rename from onap-enabler-be/src/test/resources/pnf.csar
rename to onap-enabler/onap-enabler-be/src/test/resources/pnf.csar
Binary files differ
diff --git a/onap-enabler-be/src/test/resources/policy-configuration-by-policy-false.JSON b/onap-enabler/onap-enabler-be/src/test/resources/policy-configuration-by-policy-false.JSON
similarity index 100%
rename from onap-enabler-be/src/test/resources/policy-configuration-by-policy-false.JSON
rename to onap-enabler/onap-enabler-be/src/test/resources/policy-configuration-by-policy-false.JSON
diff --git a/onap-enabler-be/src/test/resources/policy-configuration-csar.JSON b/onap-enabler/onap-enabler-be/src/test/resources/policy-configuration-csar.JSON
similarity index 100%
rename from onap-enabler-be/src/test/resources/policy-configuration-csar.JSON
rename to onap-enabler/onap-enabler-be/src/test/resources/policy-configuration-csar.JSON
diff --git a/onap-enabler-be/src/test/resources/roles.json b/onap-enabler/onap-enabler-be/src/test/resources/roles.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/roles.json
rename to onap-enabler/onap-enabler-be/src/test/resources/roles.json
diff --git a/onap-enabler-be/src/test/resources/sampleTosca.csar b/onap-enabler/onap-enabler-be/src/test/resources/sampleTosca.csar
similarity index 100%
rename from onap-enabler-be/src/test/resources/sampleTosca.csar
rename to onap-enabler/onap-enabler-be/src/test/resources/sampleTosca.csar
Binary files differ
diff --git a/onap-enabler-be/src/test/resources/services/change_management_software_update_expected_mso_request.json b/onap-enabler/onap-enabler-be/src/test/resources/services/change_management_software_update_expected_mso_request.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/services/change_management_software_update_expected_mso_request.json
rename to onap-enabler/onap-enabler-be/src/test/resources/services/change_management_software_update_expected_mso_request.json
diff --git a/onap-enabler-be/src/test/resources/services/change_management_software_update_request.json b/onap-enabler/onap-enabler-be/src/test/resources/services/change_management_software_update_request.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/services/change_management_software_update_request.json
rename to onap-enabler/onap-enabler-be/src/test/resources/services/change_management_software_update_request.json
diff --git a/onap-enabler-be/src/test/resources/vf-csar.JSON b/onap-enabler/onap-enabler-be/src/test/resources/vf-csar.JSON
similarity index 100%
rename from onap-enabler-be/src/test/resources/vf-csar.JSON
rename to onap-enabler/onap-enabler-be/src/test/resources/vf-csar.JSON
diff --git a/onap-enabler-be/src/test/resources/vf-with-annotation-csar.json b/onap-enabler/onap-enabler-be/src/test/resources/vf-with-annotation-csar.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/vf-with-annotation-csar.json
rename to onap-enabler/onap-enabler-be/src/test/resources/vf-with-annotation-csar.json
diff --git a/onap-enabler-be/src/test/resources/vf-with-vfcInstanceGroups.json b/onap-enabler/onap-enabler-be/src/test/resources/vf-with-vfcInstanceGroups.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/vf-with-vfcInstanceGroups.json
rename to onap-enabler/onap-enabler-be/src/test/resources/vf-with-vfcInstanceGroups.json
diff --git a/onap-enabler-be/src/test/resources/vl-csar.JSON b/onap-enabler/onap-enabler-be/src/test/resources/vl-csar.JSON
similarity index 100%
rename from onap-enabler-be/src/test/resources/vl-csar.JSON
rename to onap-enabler/onap-enabler-be/src/test/resources/vl-csar.JSON
diff --git a/onap-enabler-be/src/test/resources/vnfConfigUpdatePayload.json b/onap-enabler/onap-enabler-be/src/test/resources/vnfConfigUpdatePayload.json
similarity index 100%
rename from onap-enabler-be/src/test/resources/vnfConfigUpdatePayload.json
rename to onap-enabler/onap-enabler-be/src/test/resources/vnfConfigUpdatePayload.json
diff --git a/onap-enabler-be/version.properties b/onap-enabler/onap-enabler-be/version.properties
similarity index 100%
rename from onap-enabler-be/version.properties
rename to onap-enabler/onap-enabler-be/version.properties
diff --git a/onap-enabler-infra/README.md b/onap-enabler/onap-enabler-infra/README.md
similarity index 100%
rename from onap-enabler-infra/README.md
rename to onap-enabler/onap-enabler-infra/README.md
diff --git a/onap-enabler/onap-enabler-infra/pom.xml b/onap-enabler/onap-enabler-infra/pom.xml
new file mode 100644
index 0000000..12958e7
--- /dev/null
+++ b/onap-enabler/onap-enabler-infra/pom.xml
@@ -0,0 +1,322 @@
+<?xml version="1.0"?>
+<!--/*-
+ * ============LICENSE_START=======================================================
+ * OSAM Core
+ * ================================================================================
+ * Copyright (C) 2018 AT&T
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler</artifactId>
+ <version>0.0.2</version>
+ </parent>
+ <artifactId>onap-enabler-infra</artifactId>
+ <packaging>war</packaging>
+
+ <profiles>
+ <!-- disable doclint, a new feature in Java 8, when generating javadoc -->
+ <profile>
+ <id>doclint-java8-disable</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <build>
+ <finalName>onap-enabler</finalName>
+ <plugins>
+ <!-- License plugin should only run once at the start of the project.
+ For new classes, the header should be added manually by the company which creates it.-->
+
+ <!--<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>1.16</version>
+ <configuration>
+ <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+ <processStartTag>============LICENSE_START=======================================================</processStartTag>
+ <processEndTag>============LICENSE_END=========================================================</processEndTag>
+ <sectionDelimiter>================================================================================</sectionDelimiter>
+ <licenseName>apache_v2</licenseName>
+ <inceptionYear>2018</inceptionYear>
+ <organizationName>AT&T</organizationName>
+ <projectName>OSAM</projectName>
+ <canUpdateCopyright>true</canUpdateCopyright>
+ <canUpdateDescription>true</canUpdateDescription>
+ <canUpdateLicense>true</canUpdateLicense>
+ <emptyLineAfterHeader>true</emptyLineAfterHeader>
+ <verbose>false</verbose>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>first</id>
+ <goals>
+ <goal>update-file-header</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ </plugin>-->
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+
+
+ <!-- add version number to manifest -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Build-Number>${project.version}</Build-Number>
+ <Build-Time>${maven.build.timestamp}</Build-Time>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- SDK overlay war -->
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-overlay</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler-be</artifactId>
+ <type>war</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler-be</artifactId>
+ <type>jar</type>
+ <classifier>classes</classifier>
+ </dependency>
+ <!-- SDK components -->
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-analytics</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-workflow</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Mapper -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.att.eelf</groupId>
+ <artifactId>eelf-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.searchbox</groupId>
+ <artifactId>jest</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <exclusions>
+ <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- bridge to implement commons-logging using slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
+ <!-- <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>-->
+ <!-- TEST-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/config/Swagger2Config.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/config/Swagger2Config.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/config/Swagger2Config.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/config/Swagger2Config.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/Register.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/Register.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/Register.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/Register.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
diff --git a/onap-enabler-infra/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
similarity index 100%
rename from onap-enabler-infra/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
rename to onap-enabler/onap-enabler-infra/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
diff --git a/onap-enabler-infra/src/main/resources/cache.ccf b/onap-enabler/onap-enabler-infra/src/main/resources/cache.ccf
similarity index 100%
rename from onap-enabler-infra/src/main/resources/cache.ccf
rename to onap-enabler/onap-enabler-infra/src/main/resources/cache.ccf
diff --git a/onap-enabler-infra/src/main/resources/cache_template.ccf b/onap-enabler/onap-enabler-infra/src/main/resources/cache_template.ccf
similarity index 100%
rename from onap-enabler-infra/src/main/resources/cache_template.ccf
rename to onap-enabler/onap-enabler-infra/src/main/resources/cache_template.ccf
diff --git a/onap-enabler-infra/src/main/resources/catalog.json b/onap-enabler/onap-enabler-infra/src/main/resources/catalog.json
similarity index 100%
rename from onap-enabler-infra/src/main/resources/catalog.json
rename to onap-enabler/onap-enabler-infra/src/main/resources/catalog.json
diff --git a/onap-enabler-infra/src/main/resources/key.properties b/onap-enabler/onap-enabler-infra/src/main/resources/key.properties
similarity index 100%
rename from onap-enabler-infra/src/main/resources/key.properties
rename to onap-enabler/onap-enabler-infra/src/main/resources/key.properties
diff --git a/onap-enabler-infra/src/main/resources/logback.xml b/onap-enabler/onap-enabler-infra/src/main/resources/logback.xml
similarity index 100%
rename from onap-enabler-infra/src/main/resources/logback.xml
rename to onap-enabler/onap-enabler-infra/src/main/resources/logback.xml
diff --git a/onap-enabler-infra/src/main/resources/logback_template.xml b/onap-enabler/onap-enabler-infra/src/main/resources/logback_template.xml
similarity index 100%
rename from onap-enabler-infra/src/main/resources/logback_template.xml
rename to onap-enabler/onap-enabler-infra/src/main/resources/logback_template.xml
diff --git a/onap-enabler-infra/src/main/resources/mchange-log.properties b/onap-enabler/onap-enabler-infra/src/main/resources/mchange-log.properties
similarity index 100%
rename from onap-enabler-infra/src/main/resources/mchange-log.properties
rename to onap-enabler/onap-enabler-infra/src/main/resources/mchange-log.properties
diff --git a/onap-enabler-infra/src/main/resources/my.cnf b/onap-enabler/onap-enabler-infra/src/main/resources/my.cnf
similarity index 100%
rename from onap-enabler-infra/src/main/resources/my.cnf
rename to onap-enabler/onap-enabler-infra/src/main/resources/my.cnf
diff --git a/onap-enabler-infra/src/main/resources/osam-core-data.sql b/onap-enabler/onap-enabler-infra/src/main/resources/osam-core-data.sql
similarity index 100%
rename from onap-enabler-infra/src/main/resources/osam-core-data.sql
rename to onap-enabler/onap-enabler-infra/src/main/resources/osam-core-data.sql
diff --git a/onap-enabler-infra/src/main/resources/osam-core-pre-init.sql b/onap-enabler/onap-enabler-infra/src/main/resources/osam-core-pre-init.sql
similarity index 100%
rename from onap-enabler-infra/src/main/resources/osam-core-pre-init.sql
rename to onap-enabler/onap-enabler-infra/src/main/resources/osam-core-pre-init.sql
diff --git a/onap-enabler-infra/src/main/resources/osam-core-schema.sql b/onap-enabler/onap-enabler-infra/src/main/resources/osam-core-schema.sql
similarity index 100%
rename from onap-enabler-infra/src/main/resources/osam-core-schema.sql
rename to onap-enabler/onap-enabler-infra/src/main/resources/osam-core-schema.sql
diff --git a/onap-enabler-infra/src/main/resources/portal.properties b/onap-enabler/onap-enabler-infra/src/main/resources/portal.properties
similarity index 100%
rename from onap-enabler-infra/src/main/resources/portal.properties
rename to onap-enabler/onap-enabler-infra/src/main/resources/portal.properties
diff --git a/onap-enabler-infra/src/main/resources/portal_template.properties b/onap-enabler/onap-enabler-infra/src/main/resources/portal_template.properties
similarity index 100%
rename from onap-enabler-infra/src/main/resources/portal_template.properties
rename to onap-enabler/onap-enabler-infra/src/main/resources/portal_template.properties
diff --git a/onap-enabler-infra/src/main/resources/sampleTosca.csar b/onap-enabler/onap-enabler-infra/src/main/resources/sampleTosca.csar
similarity index 100%
rename from onap-enabler-infra/src/main/resources/sampleTosca.csar
rename to onap-enabler/onap-enabler-infra/src/main/resources/sampleTosca.csar
Binary files differ
diff --git a/onap-enabler-infra/src/main/resources/server.xml b/onap-enabler/onap-enabler-infra/src/main/resources/server.xml
similarity index 100%
rename from onap-enabler-infra/src/main/resources/server.xml
rename to onap-enabler/onap-enabler-infra/src/main/resources/server.xml
diff --git a/onap-enabler-infra/src/main/resources/state-rules.drl b/onap-enabler/onap-enabler-infra/src/main/resources/state-rules.drl
similarity index 100%
rename from onap-enabler-infra/src/main/resources/state-rules.drl
rename to onap-enabler/onap-enabler-infra/src/main/resources/state-rules.drl
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/onap.cert b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/onap.cert
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/onap.cert
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/onap.cert
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.jks b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.jks
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.jks
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.jks
Binary files differ
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/org.onap.vid.trust.jks
Binary files differ
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_keystore b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_keystore
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_keystore
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_keystore
Binary files differ
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out2 b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out2
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out2
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/cert/tomcat_out2
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc_template.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc_template.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc_template.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/asdc_template.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz_template.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz_template.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz_template.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/quartz_template.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_app_fusion.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_db_fusion.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_pdf.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/sql.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/sql.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/sql.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/sql.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/system.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system_template.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system_template.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/conf/system_template.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/conf/system_template.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/fusion/orm/Workflow.hbm.xml
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/index.jsp b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/index.jsp
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/index.jsp
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/index.jsp
diff --git a/onap-enabler-infra/src/main/webapp/WEB-INF/web.xml b/onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from onap-enabler-infra/src/main/webapp/WEB-INF/web.xml
rename to onap-enabler/onap-enabler-infra/src/main/webapp/WEB-INF/web.xml
diff --git a/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java b/onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java
similarity index 100%
rename from onap-enabler-infra/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java
rename to onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/ExternalAppConfigTest.java
diff --git a/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java b/onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java
similarity index 100%
rename from onap-enabler-infra/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java
rename to onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/conf/HibernateMappingLocationsTest.java
diff --git a/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java b/onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
similarity index 100%
rename from onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
rename to onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
diff --git a/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegistryAdapterTest.java b/onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegistryAdapterTest.java
similarity index 100%
rename from onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegistryAdapterTest.java
rename to onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/scheduler/RegistryAdapterTest.java
diff --git a/onap-enabler-infra/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java b/onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java
similarity index 100%
rename from onap-enabler-infra/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java
rename to onap-enabler/onap-enabler-infra/src/test/java/org/onap/portalapp/service/AdminAuthExtensionTest.java
diff --git a/onap-enabler-infra/version.properties b/onap-enabler/onap-enabler-infra/version.properties
similarity index 100%
rename from onap-enabler-infra/version.properties
rename to onap-enabler/onap-enabler-infra/version.properties
diff --git a/onap-enabler/pom.xml b/onap-enabler/pom.xml
new file mode 100644
index 0000000..b92f406
--- /dev/null
+++ b/onap-enabler/pom.xml
@@ -0,0 +1,517 @@
+<?xml version="1.0"?>
+<!--/*-
+ * ============LICENSE_START=======================================================
+ * OSAM Core
+ * ================================================================================
+ * Copyright (C) 2018 AT&T
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */-->
+
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler</artifactId>
+ <version>0.0.2</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <encoding>UTF-8</encoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <epsdk.version>2.4.0</epsdk.version>
+ <springframework.version>4.2.9.RELEASE</springframework.version>
+ <hibernate.version>4.3.11.Final</hibernate.version>
+ <!-- Skip assembling the zip by default -->
+ <skipassembly>true</skipassembly>
+ <!-- Tests usually require some setup that maven cannot do, so skip. -->
+ <!--<skiptests>false</skiptests>-->
+ <nexusproxy>https://nexus.onap.org</nexusproxy>
+ <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+ <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+ <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+ <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>
+ <swagger.version>2.8.0</swagger.version>
+
+ <!-- SONAR -->
+ <sonar.language>java</sonar.language>
+ <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+ <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+ <sonar.projectVersion>${project.version}</sonar.projectVersion>
+
+ </properties>
+ <repositories>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>OSAM Release Repository</name>
+ <url>${nexusproxy}${releaseNexusPath}</url>
+ </repository>
+ <repository>
+ <id>ecomp-snapshots</id>
+ <name>OSAM Snapshot Repository</name>
+ <url>${nexusproxy}${snapshotNexusPath}</url>
+ </repository>
+ <repository>
+ <id>ecomp-staging</id>
+ <name>OSAM Staging Repository</name>
+ <url>${nexusproxy}${stagingNexusPath}</url>
+ </repository>
+ <repository>
+ <!-- Snapshots repository has ECOMP snapshot artifacts -->
+ <id>oss-snapshots</id>
+ <name>oss Central - Snapshots</name>
+ <url>https://oss.sonatype.org/service/local/repositories/releases/content/</url>
+ </repository>
+ <repository>
+ <id>maven2-repo</id>
+ <name>Maven2 repo</name>
+ <url>https://repo.maven.apache.org/maven2</url>
+ </repository>
+ </repositories>
+ <distributionManagement>
+ <repository>
+ <id>ecomp-releases</id>
+ <name>VID Release Repository</name>
+ <url>${nexusproxy}/${releaseNexusPath}</url>
+ </repository>
+ <snapshotRepository>
+ <id>ecomp-snapshots</id>
+ <name>VID Snapshot Repository</name>
+ <url>${nexusproxy}/${snapshotNexusPath}</url>
+ </snapshotRepository>
+ <!-- added for javadoc -->
+ <site>
+ <id>ecomp-site</id>
+ <url>dav:${nexusproxy}${sitePath}</url>
+ </site>
+ </distributionManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.att.eelf</groupId>
+ <artifactId>eelf-core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.6.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.joshworks.unirest</groupId>
+ <artifactId>unirest-java</artifactId>
+ <version>0.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>io.searchbox</groupId>
+ <artifactId>jest</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20170516</version>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <!-- bridge to implement commons-logging using slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>2.23.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-jetty-connector</artifactId>
+ <version>2.23.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>2.6.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.9.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.14.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.xebialabs.restito</groupId>
+ <artifactId>restito</artifactId>
+ <version>0.9.3</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>osam-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.19</version>
+ </dependency>
+ <dependency>
+ <groupId>org.skyscreamer</groupId>
+ <artifactId>jsonassert</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.javacrumbs.json-unit</groupId>
+ <artifactId>json-unit</artifactId>
+ <version>1.23.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>java-hamcrest</artifactId>
+ <version>2.0.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.togglz</groupId>
+ <artifactId>togglz-spring-core</artifactId>
+ <version>2.5.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.10.0</version>
+ </dependency>
+ <!-- Helpers -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.2</version>
+ </dependency>
+ <dependency>
+ <groupId>io.vavr</groupId>
+ <artifactId>vavr</artifactId>
+ <version>0.9.2</version>
+ </dependency>
+
+ <!-- SDK overlay war -->
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-overlay</artifactId>
+ <version>${epsdk.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-app-common</artifactId>
+ <version>${epsdk.version}</version>
+ <type>jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-core</artifactId>
+ <version>${epsdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-analytics</artifactId>
+ <version>${epsdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.portal.sdk</groupId>
+ <artifactId>epsdk-workflow</artifactId>
+ <version>${epsdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler-be</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.osam</groupId>
+ <artifactId>onap-enabler-be</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>classes</classifier>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.bean-matchers</groupId>
+ <artifactId>bean-matchers</artifactId>
+ <version>0.11</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <nexusUrl>${nexusproxy}</nexusUrl>
+ <stagingProfileId>176c31dfe190a</stagingProfileId>
+ <serverId>ecomp-staging</serverId>
+ </configuration>
+ </plugin>
+
+ <!-- Compile to Java 1.8 class output format -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.21.0</version>
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <!--
+ <skipTests>${skiptests}</skipTests>
+ -->
+ <includes>
+ <include>**/Test*.java</include>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ </includes>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/war</additionalClasspathElement>
+ </additionalClasspathElements>
+ <systemPropertyVariables>
+ <container.classpath>classpath:</container.classpath>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.1</version>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>2.10</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <skipAssembly>${skipassembly}</skipAssembly>
+ <descriptors>
+ <descriptor>${basedir}/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>3.3.0.603</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>onap-enabler-be</module>
+ <module>onap-enabler-infra</module>
+ </modules>
+</project>
\ No newline at end of file
diff --git a/osam-common/pom.xml b/osam-common/pom.xml
index c2311ce..734141b 100644
--- a/osam-common/pom.xml
+++ b/osam-common/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.onap.osam</groupId>
<modelVersion>4.0.0</modelVersion>
<artifactId>osam-common</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
<packaging>jar</packaging>
<properties>
diff --git a/osam-core/.mvn/wrapper/maven-wrapper.jar b/osam-core-framework/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from osam-core/.mvn/wrapper/maven-wrapper.jar
rename to osam-core-framework/.mvn/wrapper/maven-wrapper.jar
Binary files differ
diff --git a/osam-core/.mvn/wrapper/maven-wrapper.properties b/osam-core-framework/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from osam-core/.mvn/wrapper/maven-wrapper.properties
rename to osam-core-framework/.mvn/wrapper/maven-wrapper.properties
diff --git a/osam-core/README.md b/osam-core-framework/README.md
similarity index 100%
rename from osam-core/README.md
rename to osam-core-framework/README.md
diff --git a/osam-core/api/pom.xml b/osam-core-framework/api/pom.xml
similarity index 95%
rename from osam-core/api/pom.xml
rename to osam-core-framework/api/pom.xml
index e8cee60..0221e6c 100644
--- a/osam-core/api/pom.xml
+++ b/osam-core-framework/api/pom.xml
@@ -22,9 +22,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>api</artifactId>
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/AbstractStorageService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/AbstractStorageService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/AbstractStorageService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/AbstractStorageService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/AccessPodService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/AccessPodService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/AccessPodService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/AccessPodService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/AlarmService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/AlarmService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/AlarmService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/AlarmService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/BroadBandService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/BroadBandService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/BroadBandService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/BroadBandService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/DeviceService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/DeviceService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/DeviceService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/DeviceService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/PmConfigsService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/PmConfigsService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/PmConfigsService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/PmConfigsService.java
diff --git a/osam-core/api/src/main/java/org/onap/osam/api/service/SubscriberService.java b/osam-core-framework/api/src/main/java/org/onap/osam/api/service/SubscriberService.java
similarity index 100%
rename from osam-core/api/src/main/java/org/onap/osam/api/service/SubscriberService.java
rename to osam-core-framework/api/src/main/java/org/onap/osam/api/service/SubscriberService.java
diff --git a/osam-core/async-jobs/pom.xml b/osam-core-framework/async-jobs/pom.xml
similarity index 82%
rename from osam-core/async-jobs/pom.xml
rename to osam-core-framework/async-jobs/pom.xml
index 1fc4cca..ec112e3 100644
--- a/osam-core/async-jobs/pom.xml
+++ b/osam-core-framework/async-jobs/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>async-jobs</artifactId>
@@ -34,21 +34,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
- <!-- <dependency>
- <groupId>org.onap.osam</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.osam</groupId>
- <artifactId>model</artifactId>
- <version>${project.version}</version>
- </dependency>-->
<dependency>
<groupId>org.onap.osam</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.14.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/AsyncJobService.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/AsyncJobService.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/AsyncJobService.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/AsyncJobService.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobFactory.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobFactory.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobFactory.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobFactory.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobsDataAccessService.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobsDataAccessService.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/IJobsDataAccessService.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/IJobsDataAccessService.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/JobType.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/JobType.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/JobType.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/JobType.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/NextCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/NextCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/NextCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/NextCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/BaseInProgressStatusCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/BaseInProgressStatusCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/BaseInProgressStatusCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/BaseInProgressStatusCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/BaseWatchingCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/BaseWatchingCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/BaseWatchingCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/BaseWatchingCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/CommandBase.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/CommandBase.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/CommandBase.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/CommandBase.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/HttpCallCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/HttpCallCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/JobCommandFactory.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/JobCommandFactory.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/NoOpCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/NoOpCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/NoOpCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/NoOpCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/WatchingCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/WatchingCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/WatchingCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/WatchingCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/demo/ChassisCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/demo/ChassisCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/demo/ChassisCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/demo/ChassisCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/command/demo/OLTCommand.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/demo/OLTCommand.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/command/demo/OLTCommand.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/command/demo/OLTCommand.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/dao/job/JobStatus.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/dao/job/JobStatus.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/dao/job/JobStatus.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/dao/job/JobStatus.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/dao/job/OsamJob.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/dao/job/OsamJob.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/dao/job/OsamJob.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/dao/job/OsamJob.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/exceptions/JobException.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/exceptions/JobException.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/exceptions/JobException.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/exceptions/JobException.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/AsyncJobServiceImpl.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/AsyncJobServiceImpl.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/AsyncJobServiceImpl.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/AsyncJobServiceImpl.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/DummyAsyncRequest.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/DummyAsyncRequest.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/DummyAsyncRequest.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/DummyAsyncRequest.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobData.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobData.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobData.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobData.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobFactory.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobFactory.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobFactory.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobFactory.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobSchedulerInitializer.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobSharedData.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobSharedData.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobSharedData.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobSharedData.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobWorker.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobWorker.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobWorker.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobWorker.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobsDataAccessService.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobsDataAccessService.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/impl/JobsDataAccessService.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/impl/JobsDataAccessService.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/repository/job/OsamJobRepository.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/repository/job/OsamJobRepository.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/repository/job/OsamJobRepository.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/repository/job/OsamJobRepository.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/utils/Streams.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/utils/Streams.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/utils/Streams.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/utils/Streams.java
diff --git a/osam-core/async-jobs/src/main/java/org/onap/osam/job/utils/TimeUtils.java b/osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/utils/TimeUtils.java
similarity index 100%
rename from osam-core/async-jobs/src/main/java/org/onap/osam/job/utils/TimeUtils.java
rename to osam-core-framework/async-jobs/src/main/java/org/onap/osam/job/utils/TimeUtils.java
diff --git a/osam-core/async-jobs/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java b/osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
similarity index 100%
rename from osam-core/async-jobs/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
rename to osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/command/JobCommandFactoryTest.java
diff --git a/osam-core/async-jobs/src/test/java/org/onap/osam/job/command/WatchingCommandTest.java b/osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/command/WatchingCommandTest.java
similarity index 100%
rename from osam-core/async-jobs/src/test/java/org/onap/osam/job/command/WatchingCommandTest.java
rename to osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/command/WatchingCommandTest.java
diff --git a/osam-core/async-jobs/src/test/java/org/onap/osam/job/impl/JobAdapterTest.java b/osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/impl/JobAdapterTest.java
similarity index 100%
rename from osam-core/async-jobs/src/test/java/org/onap/osam/job/impl/JobAdapterTest.java
rename to osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/impl/JobAdapterTest.java
diff --git a/osam-core/async-jobs/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java b/osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
similarity index 100%
rename from osam-core/async-jobs/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
rename to osam-core-framework/async-jobs/src/test/java/org/onap/osam/job/impl/JobWorkerTest.java
diff --git a/osam-core/common/pom.xml b/osam-core-framework/common/pom.xml
similarity index 94%
rename from osam-core/common/pom.xml
rename to osam-core-framework/common/pom.xml
index cdb1e2f..f91bf82 100644
--- a/osam-core/common/pom.xml
+++ b/osam-core-framework/common/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common</artifactId>
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/AbstractOLTException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/AbstractOLTException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/AbstractOLTException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/AbstractOLTException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/BadFormatException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/BadFormatException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/BadFormatException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/BadFormatException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/GenericUncheckedException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/GenericUncheckedException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/GenericUncheckedException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/GenericUncheckedException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/InvalidOperationException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/InvalidOperationException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/InvalidOperationException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/InvalidOperationException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/NotFoundException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/NotFoundException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/NotFoundException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/NotFoundException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/ServerException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/ServerException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/ServerException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/ServerException.java
diff --git a/osam-core/common/src/main/java/org/onap/osam/common/exception/UnknownTypeException.java b/osam-core-framework/common/src/main/java/org/onap/osam/common/exception/UnknownTypeException.java
similarity index 100%
rename from osam-core/common/src/main/java/org/onap/osam/common/exception/UnknownTypeException.java
rename to osam-core-framework/common/src/main/java/org/onap/osam/common/exception/UnknownTypeException.java
diff --git a/osam-core/core/pom.xml b/osam-core-framework/core/pom.xml
similarity index 95%
rename from osam-core/core/pom.xml
rename to osam-core-framework/core/pom.xml
index 3c5b21c..ba559c1 100644
--- a/osam-core/core/pom.xml
+++ b/osam-core-framework/core/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>core</artifactId>
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/AbstractBaseServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/AbstractBaseServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/AbstractBaseServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/AbstractBaseServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/AccessPodServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/AccessPodServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/AccessPodServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/AccessPodServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/AlarmServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/AlarmServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/AlarmServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/AlarmServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/BroadBandServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/BroadBandServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/BroadBandServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/BroadBandServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/DeviceServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/DeviceServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/DeviceServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/DeviceServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/PmConfigsServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/PmConfigsServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/PmConfigsServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/PmConfigsServiceImpl.java
diff --git a/osam-core/core/src/main/java/org/onap/osam/core/SubscriberServiceImpl.java b/osam-core-framework/core/src/main/java/org/onap/osam/core/SubscriberServiceImpl.java
similarity index 100%
rename from osam-core/core/src/main/java/org/onap/osam/core/SubscriberServiceImpl.java
rename to osam-core-framework/core/src/main/java/org/onap/osam/core/SubscriberServiceImpl.java
diff --git a/osam-core/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java b/osam-core-framework/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java
similarity index 98%
rename from osam-core/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java
rename to osam-core-framework/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java
index 5abeb8f..3b974a5 100644
--- a/osam-core/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java
+++ b/osam-core-framework/core/src/test/java/org/onap/osam/core/DeviceServiceImplTest.java
@@ -35,6 +35,7 @@
import org.onap.osam.common.exception.AbstractOLTException;
import org.onap.osam.common.exception.InvalidOperationException;
import org.onap.osam.common.exception.NotFoundException;
+import org.onap.osam.common.exception.ServerException;
import org.onap.osam.external.grpc.AbstractOLTClient;
import org.onap.osam.model.dao.*;
import org.onap.osam.model.repository.ChassisRepository;
@@ -268,7 +269,7 @@
public void whenAddOLTSlotAbstractOLTReturnsNull_shouldThrowException() {
when(abstractOLTClient.createOLTChassis(oltSlot)).thenReturn(null);
- assertThatThrownBy(()-> deviceService.addOLTSlot(oltSlot, chassis)).isInstanceOf(AbstractOLTException.class);
+ assertThatThrownBy(()-> deviceService.addOLTSlot(oltSlot, chassis)).isInstanceOf(ServerException.class);
//verify no DB interactions
verifyZeroInteractions(oltSlotRepository, oltPortRepository, chassisRepository);
}
@@ -392,7 +393,7 @@
when(abstractOLTClient.provisionONT(ontDevice)).thenReturn(false);
when(abstractOLTClient.preProvisionOnt(ontDevice)).thenReturn(false);
when(abstractOLTClient.provisionOntFull(ontDevice)).thenReturn(false);
- assertThatThrownBy(()-> deviceService.provisionONTDevice(ontDevice, provType)).isInstanceOf(AbstractOLTException.class);
+ assertThatThrownBy(()-> deviceService.provisionONTDevice(ontDevice, provType)).isInstanceOf(ServerException.class);
}
diff --git a/osam-core/external/pom.xml b/osam-core-framework/external/pom.xml
similarity index 97%
rename from osam-core/external/pom.xml
rename to osam-core-framework/external/pom.xml
index 9f1c4f1..e81ff9b 100644
--- a/osam-core/external/pom.xml
+++ b/osam-core-framework/external/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/AaiClient.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiClient.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/AaiClient.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiClient.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/AaiClientImpl.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiClientImpl.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/AaiClientImpl.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiClientImpl.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/AaiWebClient.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiWebClient.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/AaiWebClient.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/AaiWebClient.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/config/AaiConfig.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/config/AaiConfig.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/config/AaiConfig.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/config/AaiConfig.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/exception/ExternalSystemException.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/exception/ExternalSystemException.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/exception/ExternalSystemException.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/exception/ExternalSystemException.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/model/PNF.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/model/PNF.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/model/PNF.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/model/PNF.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/aai/util/AaiHeaderUtil.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/aai/util/AaiHeaderUtil.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/aai/util/AaiHeaderUtil.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/aai/util/AaiHeaderUtil.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java
similarity index 78%
rename from osam-core/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java
index 81f2851..073c69f 100644
--- a/osam-core/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java
+++ b/osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTClient.java
@@ -57,10 +57,17 @@
import io.grpc.ManagedChannelBuilder;
import lombok.extern.slf4j.Slf4j;
import org.onap.osam.common.exception.AbstractOLTException;
-import org.onap.osam.common.exception.NotFoundException;
-import org.onap.osam.grpc.*;
+import org.onap.osam.common.exception.ServerException;
+import org.onap.osam.grpc.AbstractOLTGrpc;
+import org.onap.osam.grpc.AddChassisMessage;
+import org.onap.osam.grpc.AddChassisReturn;
+import org.onap.osam.grpc.AddOLTChassisMessage;
+import org.onap.osam.grpc.AddOLTChassisReturn;
+import org.onap.osam.grpc.AddOntFullMessage;
+import org.onap.osam.grpc.AddOntMessage;
+import org.onap.osam.grpc.AddOntReturn;
+import org.onap.osam.grpc.PreProvisionOntMessage;
import org.onap.osam.model.dao.Chassis;
-import org.onap.osam.model.dao.OLTPort;
import org.onap.osam.model.dao.OLTSlot;
import org.onap.osam.model.dao.ONTDevice;
import org.springframework.beans.factory.annotation.Value;
@@ -97,35 +104,39 @@
/** create chassis */
public void createChassis(Chassis chassis) {
+ try {
+ log.info("createChassis begin, chassis: {}", chassis);
- log.info("createChassis begin, chassis: {}", chassis);
+ String clli = chassis.getClli();
+ int rack = chassis.getRack();
+ int shelf = chassis.getShelf();
+ String xosIP = chassis.getAccessPod().getCoreIp();
+ int port = Integer.parseInt(chassis.getAccessPod().getCorePort());
+ String user = chassis.getAccessPod().getUsername();
+ String pass = chassis.getAccessPod().getPassword();
- String clli = chassis.getClli();
- int rack = chassis.getRack();
- int shelf = chassis.getShelf();
- String xosIP = chassis.getAccessPod().getCoreIp();
- int port = Integer.parseInt(chassis.getAccessPod().getCorePort());
- String user = chassis.getAccessPod().getUsername();
- String pass = chassis.getAccessPod().getPassword();
+ AddChassisMessage request = AddChassisMessage.newBuilder()
+ .setCLLI(clli)
+ .setRack(rack)
+ .setShelf(shelf)
+ .setXOSIP(xosIP)
+ .setXOSPort(port)
+ .setXOSUser(user)
+ .setXOSPassword(pass)
+ .build();
- AddChassisMessage request = AddChassisMessage.newBuilder()
- .setCLLI(clli)
- .setRack(rack)
- .setShelf(shelf)
- .setXOSIP(xosIP)
- .setXOSPort(port)
- .setXOSUser(user)
- .setXOSPassword(pass)
- .build();
+ log.info("AddChassisMessage message: {}", request);
- log.info("AddChassisMessage message: {}", request);
-
- AddChassisReturn response = blockingStub.createChassis(request);
- if(!StringUtils.isEmpty(response.getDeviceID())) {
- log.info("Chassis created in AbstractOLT with clli : {}",clli);
- } else {
- log.error("DeviceId of created chassis in AbstractOLT is empty or null, chassis: {}", chassis);
- throw new AbstractOLTException("DeviceId of created chassis in AbstractOLT is empty or null");
+ AddChassisReturn response = blockingStub.createChassis(request);
+ if (!StringUtils.isEmpty(response.getDeviceID())) {
+ log.info("Chassis created in AbstractOLT with clli : {}", clli);
+ } else {
+ log.error("DeviceId of created chassis in AbstractOLT is empty or null, chassis: {}", chassis);
+ throw new ServerException("DeviceId of created chassis in AbstractOLT is empty or null");
+ }
+ } catch (RuntimeException e){
+ log.error("Chassis creation failed", e);
+ throw new AbstractOLTException("Chassis creation failed for chassis : {}", chassis);
}
}
@@ -157,7 +168,7 @@
log.info("OLT Chassis created in AbstractOLT deviceId : {} chassisDeviceId : {}",deviceID,chassisDeviceId);
} else {
log.error("Invalid return argument from AbstractOLT, deviceId : {} chassisDeviceId : {}",deviceID,chassisDeviceId);
- throw new AbstractOLTException("DeviceId of created chassis in AbstractOLT is empty or null");
+ throw new ServerException("DeviceId of created chassis in AbstractOLT is empty or null");
}
} catch (RuntimeException e) {
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTServer.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTServer.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTServer.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/AbstractOLTServer.java
diff --git a/osam-core/external/src/main/java/org/onap/osam/external/grpc/OntMessageFactory.java b/osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/OntMessageFactory.java
similarity index 100%
rename from osam-core/external/src/main/java/org/onap/osam/external/grpc/OntMessageFactory.java
rename to osam-core-framework/external/src/main/java/org/onap/osam/external/grpc/OntMessageFactory.java
diff --git a/osam-core/external/src/main/proto/abstract_olt_api.proto b/osam-core-framework/external/src/main/proto/abstract_olt_api.proto
similarity index 100%
rename from osam-core/external/src/main/proto/abstract_olt_api.proto
rename to osam-core-framework/external/src/main/proto/abstract_olt_api.proto
diff --git a/osam-core/external/src/main/proto/google/api/annotations.proto b/osam-core-framework/external/src/main/proto/google/api/annotations.proto
similarity index 100%
rename from osam-core/external/src/main/proto/google/api/annotations.proto
rename to osam-core-framework/external/src/main/proto/google/api/annotations.proto
diff --git a/osam-core/external/src/main/proto/google/api/http.proto b/osam-core-framework/external/src/main/proto/google/api/http.proto
similarity index 100%
rename from osam-core/external/src/main/proto/google/api/http.proto
rename to osam-core-framework/external/src/main/proto/google/api/http.proto
diff --git a/osam-core/external/src/main/resources/aai.properties b/osam-core-framework/external/src/main/resources/aai.properties
similarity index 100%
rename from osam-core/external/src/main/resources/aai.properties
rename to osam-core-framework/external/src/main/resources/aai.properties
diff --git a/osam-core/external/src/main/resources/abstractolt.properties b/osam-core-framework/external/src/main/resources/abstractolt.properties
similarity index 100%
rename from osam-core/external/src/main/resources/abstractolt.properties
rename to osam-core-framework/external/src/main/resources/abstractolt.properties
diff --git a/osam-core/external/src/test/java/org/onap/osam/external/aai/AaiClientTestIT.java b/osam-core-framework/external/src/test/java/org/onap/osam/external/aai/AaiClientTestIT.java
similarity index 100%
rename from osam-core/external/src/test/java/org/onap/osam/external/aai/AaiClientTestIT.java
rename to osam-core-framework/external/src/test/java/org/onap/osam/external/aai/AaiClientTestIT.java
diff --git a/osam-core/main/pom.xml b/osam-core-framework/main/pom.xml
similarity index 92%
rename from osam-core/main/pom.xml
rename to osam-core-framework/main/pom.xml
index fd6ec74..7186578 100644
--- a/osam-core/main/pom.xml
+++ b/osam-core-framework/main/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>main</artifactId>
@@ -37,7 +37,7 @@
</dependency>
</dependencies>
<build>
- <finalName>osam-core-${project.version}</finalName>
+ <finalName>osam-core-framework-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/osam-core/main/src/main/java/org/onap/osam/OsamApplication.java b/osam-core-framework/main/src/main/java/org/onap/osam/OsamApplication.java
similarity index 100%
rename from osam-core/main/src/main/java/org/onap/osam/OsamApplication.java
rename to osam-core-framework/main/src/main/java/org/onap/osam/OsamApplication.java
diff --git a/osam-core/main/src/main/resource/banner.txt b/osam-core-framework/main/src/main/resource/banner.txt
similarity index 100%
rename from osam-core/main/src/main/resource/banner.txt
rename to osam-core-framework/main/src/main/resource/banner.txt
diff --git a/osam-core/main/src/test/java/org/onap/osam/OsamApplicationTests.java b/osam-core-framework/main/src/test/java/org/onap/osam/OsamApplicationTests.java
similarity index 96%
rename from osam-core/main/src/test/java/org/onap/osam/OsamApplicationTests.java
rename to osam-core-framework/main/src/test/java/org/onap/osam/OsamApplicationTests.java
index da357de..9814086 100644
--- a/osam-core/main/src/test/java/org/onap/osam/OsamApplicationTests.java
+++ b/osam-core-framework/main/src/test/java/org/onap/osam/OsamApplicationTests.java
@@ -7,9 +7,9 @@
* 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.
@@ -20,7 +20,7 @@
-package org.onap.osam;
+/*package org.onap.osam;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,4 +34,4 @@
public void contextLoads() {
}
-}
+}*/
diff --git a/osam-core/model/pom.xml b/osam-core-framework/model/pom.xml
similarity index 95%
rename from osam-core/model/pom.xml
rename to osam-core-framework/model/pom.xml
index 93c706f..2a32ecf 100644
--- a/osam-core/model/pom.xml
+++ b/osam-core-framework/model/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>model</artifactId>
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/AccessPod.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AccessPod.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/AccessPod.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AccessPod.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/ActiveAlarmsAndEvents.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ActiveAlarmsAndEvents.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/ActiveAlarmsAndEvents.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ActiveAlarmsAndEvents.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/ActivityState.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ActivityState.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/ActivityState.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ActivityState.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/AdminState.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AdminState.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/AdminState.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AdminState.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/AlarmStatus.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AlarmStatus.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/AlarmStatus.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AlarmStatus.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/AlarmsAndEvents.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AlarmsAndEvents.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/AlarmsAndEvents.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/AlarmsAndEvents.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/BaseEntity.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/BaseEntity.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/BaseEntity.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/BaseEntity.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/Chassis.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Chassis.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/Chassis.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Chassis.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/HistoricalAlarmsAndEvents.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/HistoricalAlarmsAndEvents.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/HistoricalAlarmsAndEvents.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/HistoricalAlarmsAndEvents.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/OLTPort.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OLTPort.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/OLTPort.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OLTPort.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/OLTSlot.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OLTSlot.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/OLTSlot.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OLTSlot.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/ONTDevice.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ONTDevice.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/ONTDevice.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/ONTDevice.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/OltDriver.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OltDriver.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/OltDriver.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OltDriver.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/OltType.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OltType.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/OltType.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/OltType.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfig.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfig.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfig.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfig.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfigType.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfigType.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfigType.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfigType.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfigs.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfigs.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/PmConfigs.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmConfigs.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/PmGroupConfig.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmGroupConfig.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/PmGroupConfig.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/PmGroupConfig.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/Service.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Service.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/Service.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Service.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/SpeedProfile.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/SpeedProfile.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/SpeedProfile.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/SpeedProfile.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/StreamDirection.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/StreamDirection.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/StreamDirection.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/StreamDirection.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/Subscriber.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Subscriber.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/Subscriber.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/Subscriber.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/dao/TechnologyProfile.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/dao/TechnologyProfile.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/dao/TechnologyProfile.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/dao/TechnologyProfile.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/AccessPodRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/AccessPodRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/AccessPodRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/AccessPodRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/ActiveAlarmsAndEventsRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ActiveAlarmsAndEventsRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/ActiveAlarmsAndEventsRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ActiveAlarmsAndEventsRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/ChassisRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ChassisRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/ChassisRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ChassisRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/HistoricalAlarmsAndEventsRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/HistoricalAlarmsAndEventsRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/HistoricalAlarmsAndEventsRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/HistoricalAlarmsAndEventsRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/OLTPortRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/OLTPortRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/OLTPortRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/OLTPortRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/OLTSlotRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/OLTSlotRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/OLTSlotRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/OLTSlotRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/ONTDeviceRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ONTDeviceRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/ONTDeviceRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ONTDeviceRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/PmConfigRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmConfigRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/PmConfigRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmConfigRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/PmConfigsRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmConfigsRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/PmConfigsRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmConfigsRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/PmGroupConfigRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmGroupConfigRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/PmGroupConfigRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/PmGroupConfigRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/ServiceRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ServiceRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/ServiceRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/ServiceRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/SpeedProfileRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/SpeedProfileRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/SpeedProfileRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/SpeedProfileRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/SubscriberRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/SubscriberRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/SubscriberRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/SubscriberRepository.java
diff --git a/osam-core/model/src/main/java/org/onap/osam/model/repository/TechnologyProfileRepository.java b/osam-core-framework/model/src/main/java/org/onap/osam/model/repository/TechnologyProfileRepository.java
similarity index 100%
rename from osam-core/model/src/main/java/org/onap/osam/model/repository/TechnologyProfileRepository.java
rename to osam-core-framework/model/src/main/java/org/onap/osam/model/repository/TechnologyProfileRepository.java
diff --git a/osam-core/model/src/main/resources/application.properties b/osam-core-framework/model/src/main/resources/application.properties
similarity index 100%
rename from osam-core/model/src/main/resources/application.properties
rename to osam-core-framework/model/src/main/resources/application.properties
diff --git a/osam-core/mvnw b/osam-core-framework/mvnw
similarity index 100%
rename from osam-core/mvnw
rename to osam-core-framework/mvnw
diff --git a/osam-core/mvnw.cmd b/osam-core-framework/mvnw.cmd
similarity index 100%
rename from osam-core/mvnw.cmd
rename to osam-core-framework/mvnw.cmd
diff --git a/osam-core/pom.xml b/osam-core-framework/pom.xml
similarity index 92%
rename from osam-core/pom.xml
rename to osam-core-framework/pom.xml
index 90b8377..102e411 100644
--- a/osam-core/pom.xml
+++ b/osam-core-framework/pom.xml
@@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.osam</groupId>
- <artifactId>osam-core</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>osam-core-framework</artifactId>
+ <version>0.0.2</version>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
@@ -70,12 +70,6 @@
<version>${junitparams.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.14.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
@@ -165,5 +159,16 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
diff --git a/osam-core/web/pom.xml b/osam-core-framework/web/pom.xml
similarity index 96%
rename from osam-core/web/pom.xml
rename to osam-core-framework/web/pom.xml
index 62d4473..f29c599 100644
--- a/osam-core/web/pom.xml
+++ b/osam-core-framework/web/pom.xml
@@ -23,9 +23,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>osam-core</artifactId>
+ <artifactId>osam-core-framework</artifactId>
<groupId>org.onap.osam</groupId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>web</artifactId>
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/AbstractController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/AbstractController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/AbstractController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/AbstractController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/AccessPodRestController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/AccessPodRestController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/AccessPodRestController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/AccessPodRestController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/AsyncJobDemoController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/AsyncJobDemoController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/AsyncJobDemoController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/AsyncJobDemoController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/DeviceController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/DeviceController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/DeviceController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/DeviceController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/ServiceController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/ServiceController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/ServiceController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/ServiceController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/TopologyController.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/TopologyController.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/TopologyController.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/TopologyController.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/controller/config/SwaggerConfig.java b/osam-core-framework/web/src/main/java/org/onap/osam/controller/config/SwaggerConfig.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/controller/config/SwaggerConfig.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/controller/config/SwaggerConfig.java
diff --git a/osam-core/web/src/main/java/org/onap/osam/helper/DTOMapper.java b/osam-core-framework/web/src/main/java/org/onap/osam/helper/DTOMapper.java
similarity index 100%
rename from osam-core/web/src/main/java/org/onap/osam/helper/DTOMapper.java
rename to osam-core-framework/web/src/main/java/org/onap/osam/helper/DTOMapper.java
diff --git a/pom.xml b/pom.xml
index 6b10489..a9339ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,8 @@
</activation>
<modules>
<module>osam-common</module>
- <module>onap-enabler-be</module>
- <module>onap-enabler-infra</module>
- <module>osam-core</module>
+ <module>onap-enabler</module>
+ <module>osam-core-framework</module>
</modules>
<repositories>
<repository>
@@ -261,5 +260,5 @@
<version>4.5.3</version>
</dependency>
</dependencies>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2</version>
</project>