summaryrefslogtreecommitdiffstats
path: root/ui-ci/src/main/resources
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-07-29 16:13:45 +0300
committerMichael Lando <ml636r@att.com>2018-07-29 16:20:34 +0300
commit5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch)
tree2f9dfc45191e723da69cf74be7829784e9741b94 /ui-ci/src/main/resources
parent9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff)
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'ui-ci/src/main/resources')
-rw-r--r--ui-ci/src/main/resources/ci/conf/attsdc.yaml12
-rw-r--r--ui-ci/src/main/resources/ci/scripts/sendMail.sh4
-rw-r--r--ui-ci/src/main/resources/ci/scripts/startTest.sh4
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml (renamed from ui-ci/src/main/resources/ci/testSuites/devSanity.xml)21
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml19
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml10
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/devOnboardSanity.xml14
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml12
-rw-r--r--ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml19
9 files changed, 77 insertions, 38 deletions
diff --git a/ui-ci/src/main/resources/ci/conf/attsdc.yaml b/ui-ci/src/main/resources/ci/conf/attsdc.yaml
index 403d915aef..e6790939cf 100644
--- a/ui-ci/src/main/resources/ci/conf/attsdc.yaml
+++ b/ui-ci/src/main/resources/ci/conf/attsdc.yaml
@@ -1,6 +1,6 @@
outputFolder: target
reportName: index.html
-catalogBeHost: 127.0.0.1
+catalogBeHost: 192.168.33.10
#Automate
#catalogBeHost: 135.63.125.67
#catalogFeHost: 135.63.125.63
@@ -20,7 +20,7 @@ neoHost: neoHost
neoPort: 7474
neoDBusername: neo4j
neoDBpassword: 123456
-url: http://localhost:8285/sdc1
+url: http://192.168.33.10:8285/sdc1
#url: https://www.e-access.att.com/QA-AUTOMATE1/sdc1/portal
#url: https://www.e-access.att.com/AA-IFT-testing/sdc1/portal
#url: https://www.e-access.att.com/QA-SCRUM1/sdc1/portal
@@ -36,10 +36,10 @@ configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml
importTypesConfigDir: src/test/resources/CI/importTypesTest
browser: FireFox
windowsDownloadDirectory: "c:\\apache-ftpserver-1.1.0\\res\\home\\"
-systemUnderDebug: false
+systemUnderDebug: true
reportDBhost: dbhost
reportDBport: 27017
-sdcHttpMethod: https
+sdcHttpMethod: http
localDataCenter: DC-Automate01
useBrowserMobProxy: false
@@ -48,7 +48,9 @@ captureTraffic: false
titanPropertiesFile: src/main/resources/ci/conf/titan.properties
stopOnClassFailure: false
-
+#todo
+onboardingBeHost: 192.168.33.10
+onboardingBePort: 8080
#List of non-abstract resources to keep during titan cleanup between tests
#Only 1.0 version will be kept
resourcesNotToDelete:
diff --git a/ui-ci/src/main/resources/ci/scripts/sendMail.sh b/ui-ci/src/main/resources/ci/scripts/sendMail.sh
index ead4e343d6..932b624a33 100644
--- a/ui-ci/src/main/resources/ci/scripts/sendMail.sh
+++ b/ui-ci/src/main/resources/ci/scripts/sendMail.sh
@@ -6,9 +6,9 @@ REPORT_NAME=$1
VERSION=$2
ENV=$3
-RECIPIENTS1="dl-sdcqa@att.com,ml636r@att.com,bl5783@att.com,ak314p@att.com,el489u@att.com,hk096q@att.com,bs5719@att.com"
+RECIPIENTS1="md9897@att.com,NETCOM_ASDC_DEV@att.com,IL-D2-QA-Alex@att.com,bs5719@att.com,yg356h@att.com,yr9970@att.com,sl615n@att.com,yn813h@att.com,as221v@att.com,ms172g@att.com,ma2244@att.com,el489u@att.com,gg980r@att.com,ak991p@att.com,bv095y@att.com,ms656r@att.com,df502y@att.com,bt750h@att.com,ln699k@att.com,hm104p@att.com"
#RECIPIENTS2="dl-asdcqa@att.com"
-RECIPIENTS2="md9897@att.com,ms656r@att.com,al714h@att.com,ak991p@att.com,ya107f@att.com,bv095y@att.com,st198j@att.com,th0695@att.com,vk195d@att.com,gg980r@att.com,il0695@att.com,el489u@att.com"
+RECIPIENTS2="md9897@att.com,NETCOM_ASDC_DEV@att.com,IL-D2-QA-Alex@att.com,bs5719@att.com,yg356h@att.com,yr9970@att.com,sl615n@att.com,yn813h@att.com,as221v@att.com,ms172g@att.com,ma2244@att.com,el489u@att.com,gg980r@att.com,ak991p@att.com,bv095y@att.com,ms656r@att.com,df502y@att.com,bt750h@att.com,ln699k@att.com,hm104p@att.com"
source ExtentReport/versions.info
if [ -z "$REPORT_NAME" ]
diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh
index e1065583aa..93064d0678 100644
--- a/ui-ci/src/main/resources/ci/scripts/startTest.sh
+++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh
@@ -123,7 +123,7 @@ if [ ${REMOTE_DEBUG} == "true" ]; then
JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ;
fi
-cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
+cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -Dorg.freemarker.loggerLibrary=none -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
if [ $DEBUG == "true" ]
@@ -138,7 +138,7 @@ if [ ${RERUN} == "true" ]; then
echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ...";
prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE;
SUITE_FILE=${fileName};
- cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
+ cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -DfilePath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -Dorg.freemarker.loggerLibrary=none -cp $JAR_FILE ${MainClass} $SUITE_FILE &"
$cmd;
fi
fi
diff --git a/ui-ci/src/main/resources/ci/testSuites/devSanity.xml b/ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml
index 6c4ba547b1..e712730d59 100644
--- a/ui-ci/src/main/resources/ci/testSuites/devSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/archiveRestoreSanity.xml
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="4" data-provider-thread-count="2">
+ <parameter name="makeDistribution" value="true"/>
+
<test name="uiSanity">
- <classes>
-
- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard">
- <methods>
- <include name="onboardVNFTestSanity"/>
- </methods>
- </class>
-
-
-
-
-
-
+ <classes>
+
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.ArchiveRestoreTest"/>
+ <!-- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Product"/> -->
+
+
</classes>
</test> <!-- uitests -->
</suite> <!-- uisuite --> \ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml b/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml
new file mode 100644
index 0000000000..3a637065ca
--- /dev/null
+++ b/ui-ci/src/main/resources/ci/testSuites/arifactsSanity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="4" data-provider-thread-count="2">
+ <parameter name="makeDistribution" value="true"/>
+
+ <test name="uiSanity">
+ <classes>
+
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.VFCArtifacts"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.VfArtifacts"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.VfDeploymentInformationalArtifacts"/>
+ <class name="org.openecomp.sdc.ci.tests.US.ImportUpdateInformationalDeploymentArtifacts"/>
+ <class name="org.openecomp.sdc.ci.tests.US.MIBsArtifactsOnResourceInstance"/>
+ <class name="org.openecomp.sdc.ci.tests.US.NewArtifactTypeGuide"/>
+ <class name="org.openecomp.sdc.ci.tests.US.RemoveRestrictionOfDeploymentArtifacts"/>
+
+ </classes>
+ </test> <!-- uitests -->
+</suite> <!-- uisuite --> \ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml b/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml
new file mode 100644
index 0000000000..02eb27f9a8
--- /dev/null
+++ b/ui-ci/src/main/resources/ci/testSuites/complexServiceSanity.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="systemtests" configfailurepolicy="continue" parallel="methods" thread-count="2" data-provider-thread-count="2">
+ <parameter name="makeDistribution" value="true"/>
+ <test name="complexServiceSanity">
+ <classes>
+ <class name="org.openecomp.sdc.ci.tests.execute.AmdocsComplexService.CreatePath"/>
+ </classes>
+ </test> <!-- uitests -->
+</suite> <!-- uisuite --> \ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/testSuites/devOnboardSanity.xml b/ui-ci/src/main/resources/ci/testSuites/devOnboardSanity.xml
deleted file mode 100644
index 5b44e68375..0000000000
--- a/ui-ci/src/main/resources/ci/testSuites/devOnboardSanity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="uitests" configfailurepolicy="continue">
- <test name="uitests">
- <classes>
- <!--onboard-->
- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Onboard">
- <methods>
- <include name="onboardVNFTestSanity"/>
- </methods>
- </class>
- </classes>
- </test> <!-- uitests -->
-</suite> <!-- uisuite --> \ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
index b0bcc333a5..1e295a2793 100644
--- a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
@@ -16,7 +16,7 @@
</methods>
</class>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.CatalogLeftPanelTest"/>
- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Vf"/>
+ <!--<class name="org.openecomp.sdc.ci.tests.execute.sanity.Vf"/>-->
<class name="org.openecomp.sdc.ci.tests.execute.sanity.VfAPI"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.Service"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.ImportVFCAsset"/>
@@ -28,6 +28,13 @@
<class name="org.openecomp.sdc.ci.tests.execute.sanity.AdminUserManagment"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.PNF"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.PropertiesAssignment"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.PropertiesAssignmentUpdateFlow">
+ <methods>
+ <exclude name="updatePropertyChangeVfiVersionTest"/>
+ <exclude name="deletePropertyChangeVfiVersionTest"/>
+ </methods>
+ </class>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.ArchiveRestoreTest"/>
<!-- <class name="org.openecomp.sdc.ci.tests.execute.sanity.Product"/> -->
<class name="org.openecomp.sdc.ci.tests.US.ImportUpdateInformationalDeploymentArtifacts"/>
@@ -36,7 +43,8 @@
<class name="org.openecomp.sdc.ci.tests.US.RemoveRestrictionOfDeploymentArtifacts"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsThroughAPI"/>
<class name="org.openecomp.sdc.ci.tests.execute.sanity.PortMirroring"/>
-
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.Annotation"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.UpgradeServices"/>
<!-- <class name="org.openecomp.sdc.ci.tests.US.AddComponentInstancesArtifactsInCsar"/> -->
</classes>
diff --git a/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml b/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml
new file mode 100644
index 0000000000..0a7e30edf7
--- /dev/null
+++ b/ui-ci/src/main/resources/ci/testSuites/propertyAssignmentSanity.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
+ <parameter name="makeDistribution" value="true"/>
+
+ <test name="uiSanity">
+ <classes>
+
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.PropertiesAssignment"/>
+ <class name="org.openecomp.sdc.ci.tests.execute.sanity.PropertiesAssignmentUpdateFlow">
+ <methods>
+ <exclude name="updatePropertyChangeVfiVersionTest"/>
+ <exclude name="deletePropertyChangeVfiVersionTest"/>
+ </methods>
+ </class>
+
+ </classes>
+ </test> <!-- uitests -->
+</suite> <!-- uisuite --> \ No newline at end of file