diff options
14 files changed, 70 insertions, 440 deletions
diff --git a/cmso-robot/docker/Dockerfile b/cmso-robot/docker/Dockerfile index b70c16b..aa41520 100644 --- a/cmso-robot/docker/Dockerfile +++ b/cmso-robot/docker/Dockerfile @@ -1,22 +1,51 @@ -FROM robotframework/rfdocker:3.1.1 +FROM ubuntu:16.04 MAINTAINER "CMSO" LABEL name="Docker image for the CMSO Robot Testing Framework" LABEL usage="docker run -e <testname> optf-cmso-robot" +RUN apt-get update +RUN apt-get install -y software-properties-common vim +RUN add-apt-repository ppa:jonathonf/python-3.6 +RUN apt-get update +RUN apt-get install -y build-essential python3.6 python3.6-dev python3-pip python3.6-venv + +# update pip +RUN python3.6 -m pip install pip --upgrade +RUN python3.6 -m pip install wheel + +RUN apt-get update \ + && apt-get install \ + --no-install-recommends \ + --assume-yes \ + chromium-browser \ + chromium-chromedriver \ + dnsutils \ + git \ + gcc + + COPY /onap-cmso/robot /opt/cmso-robot/robot COPY /onap-cmso/ete.sh /opt/cmso-robot RUN chmod 777 /opt/cmso-robot/ete.sh COPY /onap-cmso/server.py /opt/cmso-robot + + +RUN ln -s /usr/bin/python3.6 /usr/bin/python +RUN python --version +RUN pip --version +RUN pip install robotframework==3.1.1 + RUN pip install Flask +RUN pip install selenium +RUN pip install robotframework-sshlibrary +RUN pip install robotframework-requests ###Just to keep it running CMD ["/usr/bin/python", "/opt/cmso-robot/server.py"] ### Use --entrypoint to override to run the tests test and exit ### --entrypoint /opt/cmso-robot/ete.sh - - diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml index d64709e..3700d25 100644 --- a/cmso-service/pom.xml +++ b/cmso-service/pom.xml @@ -166,10 +166,6 @@ </dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java b/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java index c8613f8..500c42b 100644 --- a/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java +++ b/cmso-service/src/test/java/org/onap/optf/cmso/AuthProviderTest.java @@ -28,20 +28,20 @@ * limitations under the License. */ - package org.onap.optf.cmso; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class AuthProviderTest { diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java b/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java deleted file mode 100644 index 8a3aa58..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/JpaInit.java +++ /dev/null @@ -1,57 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * 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.
- *
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
-
-package org.onap.optf.cmso;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import org.onap.optf.cmso.model.ApprovalType;
-import org.onap.optf.cmso.model.Domain;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-
-public class JpaInit {
-
- private static AtomicBoolean initialized = new AtomicBoolean(false);
-
- public static void init(TestEntityManager entityManager) {
- if (initialized.compareAndSet(true, true))
- return;
- Domain d = new Domain();
- d.setDomain("ChangeManagement");
- entityManager.persist(d);
- ApprovalType at = new ApprovalType();
- at.setApprovalCount(1);
- at.setDomain("ChangeManagement");
- at.setApprovalType("Tier 2");
- entityManager.persist(at);
- entityManager.flush();
-
- }
-}
diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java b/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java deleted file mode 100644 index d0b03e5..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/JtestHelper.java +++ /dev/null @@ -1,61 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * 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.
- *
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
-
-package org.onap.optf.cmso;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Map;
-import java.util.Scanner;
-import org.apache.commons.lang3.text.StrSubstitutor;
-
-public class JtestHelper {
- private static String templatefolder = "src/test/templates" + File.separator;
-
- public static String template(String filename, Map<String, String> values) {
- String data = "";
- Scanner s = null;
- try {
- File t = new File(templatefolder + filename);
- s = new Scanner(t);
- s.useDelimiter("\\Z");
- data = s.next();
- StrSubstitutor ss = new StrSubstitutor(values);
- data = ss.replace(data);
- } catch (FileNotFoundException e) {
- data = "";
- } finally {
- if (s != null)
- s.close();
- }
- return data;
- }
-}
diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java b/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java deleted file mode 100644 index aace25e..0000000 --- a/cmso-service/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * 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.
- *
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.
-*/
-
-package org.onap.optf.cmso.service.rs;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import javax.servlet.http.HttpServletRequest;
-
-public class MockHttpServletRequest {
- public StringBuffer url = new StringBuffer("http://localhost:8089/cmso/v1/ChangeManagement/schedules/");
- public HttpServletRequest request = mock(HttpServletRequest.class);
-
- MockHttpServletRequest() {
-
- when(request.getRequestURL()).thenReturn(url);
- when(request.getHeader("Authorization")).thenReturn("BasicbTEzODc3OnNjaGVkdWxlci1SMTgwMiE=");
-
- }
-
-}
diff --git a/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java b/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java index faf408b..defb7ef 100644 --- a/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java +++ b/cmso-service/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java @@ -1,52 +1,56 @@ /*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
+ *
* 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.
- *
- *
+ *
+ *
* Unless otherwise specified, all documentation contained herein is licensed
* under the Creative Commons License, Attribution 4.0 Intl. (the "License");
* you may not use this documentation except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* https://creativecommons.org/licenses/by/4.0/
- *
+ *
* Unless required by applicable law or agreed to in writing, documentation
* 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.
-*/
+ */
package org.onap.optf.cmso.utilities;
import org.onap.optf.cmso.common.PropertiesManagement;
public class PropertiesAdmin {
- public static void main(String[] args) {
- PropertiesManagement pm = new PropertiesManagement();
- if (args.length < 1) {
- System.out.println("Missing argument");
- return;
- }
- String value = "";
- if (args[0].startsWith("dec:")) {
- value = PropertiesManagement.getDecryptedValue(args[0].substring(4));
- } else {
- value = pm.getEncryptedValue(args[0]);
- }
- System.out.println(args[0] + " : " + value);
+ /**
+ * Test properties admin.
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ PropertiesManagement pm = new PropertiesManagement();
+ if (args.length < 1) {
+ System.out.println("Missing argument");
+ return;
}
-
+ String value = "";
+ if (args[0].startsWith("dec:")) {
+ value = PropertiesManagement.getDecryptedValue(args[0].substring(4));
+ } else {
+ value = pm.getEncryptedValue(args[0]);
+ }
+ System.out.println(args[0] + " : " + value);
+ }
}
diff --git a/cmso-ticketmgt/data/a.json b/cmso-ticketmgt/data/a.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/cmso-ticketmgt/data/a.json @@ -0,0 +1 @@ +{} diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml index 2012bfb..278ee01 100644 --- a/cmso-ticketmgt/pom.xml +++ b/cmso-ticketmgt/pom.xml @@ -27,7 +27,7 @@ <packaging>jar</packaging> - <name>cmso</name> + <name>cmso-ticketmgt</name> <properties> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> @@ -155,10 +155,6 @@ </dependency> <dependency> <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> <dependency> @@ -378,7 +374,7 @@ <apiVersion>1.23</apiVersion> <images> <image> - <name>onap/optf-cmso-tciketmgt</name> + <name>onap/optf-cmso-ticketmgt</name> <alias>onap-optf-cmso-tciketmgt</alias> <build> <cleanup>true</cleanup> diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java deleted file mode 100644 index ad24e4f..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/AuthProviderTest.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2019 IBM Intellectual Property. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. - */ - - -package org.onap.optf.cmso; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.onap.optf.ticketmgt.AuthProvider; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -@RunWith(MockitoJUnitRunner.class) -public class AuthProviderTest { - - @Test - public void authenticate() { - String principal = "testName"; - String credential = "testPassword"; - Authentication authentication = mock(Authentication.class); - when(authentication.getName()).thenReturn(principal); - when(authentication.getCredentials()).thenReturn(credential); - AuthProvider authProvider = new AuthProvider(); - Authentication auth = authProvider.authenticate(authentication); - assertEquals(principal, auth.getPrincipal()); - assertEquals(credential, auth.getCredentials()); - } - - @Test - public void supports() { - AuthProvider authProvider = new AuthProvider(); - assertTrue(authProvider.supports(UsernamePasswordAuthenticationToken.class)); - assertFalse(authProvider.supports(Authentication.class)); - } -}
\ No newline at end of file diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java deleted file mode 100644 index eb013a6..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/JtestHelper.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * 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. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. -*/ - -package org.onap.optf.cmso; - -import java.io.File; -import java.io.FileNotFoundException; -import java.util.Map; -import java.util.Scanner; -import org.apache.commons.lang3.text.StrSubstitutor; - -public class JtestHelper { - private static String templatefolder = "src/test/templates" + File.separator; - - public static String template(String filename, Map<String, String> values) { - String data = ""; - Scanner s = null; - try { - File t = new File(templatefolder + filename); - s = new Scanner(t); - s.useDelimiter("\\Z"); - data = s.next(); - StrSubstitutor ss = new StrSubstitutor(values); - data = ss.replace(data); - } catch (FileNotFoundException e) { - data = ""; - } finally { - if (s != null) - s.close(); - } - return data; - } -} diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java deleted file mode 100644 index cb5f9df..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/service/rs/MockHttpServletRequest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * 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. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. -*/ - -package org.onap.optf.cmso.service.rs; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; - -public class MockHttpServletRequest { - public StringBuffer url = new StringBuffer("http://localhost:8089/cmso/v1/ChangeManagement/schedules/"); - public HttpServletRequest request = mock(HttpServletRequest.class); - - MockHttpServletRequest() { - - when(request.getRequestURL()).thenReturn(url); - when(request.getHeader("Authorization")).thenReturn("BasicbTEzODc3OnNjaGVkdWxlci1SMTgwMiE="); - - } - -} diff --git a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java b/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java deleted file mode 100644 index e5a4ee3..0000000 --- a/cmso-ticketmgt/src/test/java/org/onap/optf/cmso/utilities/PropertiesAdmin.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2017-2018 AT&T Intellectual Property. - * Modifications Copyright © 2018 IBM. - * - * 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. - * - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * 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. -*/ - -package org.onap.optf.cmso.utilities; - -import org.onap.optf.cmso.common.PropertiesManagement; - -public class PropertiesAdmin { - public static void main(String[] args) { - PropertiesManagement pm = new PropertiesManagement(); - if (args.length < 1) { - System.out.println("Missing argument"); - return; - } - String value = ""; - if (args[0].startsWith("dec:")) { - value = PropertiesManagement.getDecryptedValue(args[0].substring(4)); - } else { - value = pm.getEncryptedValue(args[0]); - } - System.out.println(args[0] + " : " + value); - } - -} @@ -64,6 +64,7 @@ <modules>
<module>cmso-service</module>
<module>cmso-database</module>
+ <module>cmso-robot</module>
</modules>
<build>
|