diff options
11 files changed, 620 insertions, 7 deletions
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameterTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameterTest.java new file mode 100644 index 0000000000..17a94840cf --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentParameterTest.java @@ -0,0 +1,46 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+
+public class MsoHeatEnvironmentParameterTest {
+
+ @Test
+ public void test() {
+ MsoHeatEnvironmentParameter hep=mock(MsoHeatEnvironmentParameter.class);
+ Object op=hep.getName();
+ MsoHeatEnvironmentParameter meo=new MsoHeatEnvironmentParameter();
+ MsoHeatEnvironmentParameter mea=new MsoHeatEnvironmentParameter("name");
+ MsoHeatEnvironmentParameter mep=new MsoHeatEnvironmentParameter("name"," value");
+ mea.setName("name");
+ mep.setValue("value");
+ assert(mea.getName().equals("name"));
+ assert(mep.getValue().equals("value"));
+ assert(meo.toString()!=null);
+ //assertTrue(op.equals(hep));
+ meo.equals(op);
+ meo.hashCode();
+ }
+
+}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentResourceTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentResourceTest.java new file mode 100644 index 0000000000..fb666ea5df --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoHeatEnvironmentResourceTest.java @@ -0,0 +1,47 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import org.junit.Test;
+
+
+public class MsoHeatEnvironmentResourceTest {
+
+
+ @Test
+ public void test() {
+ Object op=true;
+ // MsoHeatEnvironmentResource mer=mock(MsoHeatEnvironmentResource.class);
+ // MsoHeatEnvironmentResource mrea=new MsoHeatEnvironmentResource();
+ MsoHeatEnvironmentResource mre=new MsoHeatEnvironmentResource("name");
+ MsoHeatEnvironmentResource mae=new MsoHeatEnvironmentResource("name", "value");
+ mre.setName("name");
+ mae.setValue("value");
+ assert(mre.getName().equals("name"));
+ assert(mae.getValue().equals("value"));
+ assert(mre.toString()!=null);
+ //assertFalse(mer.equals(op));
+ mae.equals(op);
+ mae.hashCode();
+ //when(mer.hashCode()).thenReturn(result);
+ }
+
+}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java new file mode 100644 index 0000000000..41126759ef --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoKeystoneUtilsTest.java @@ -0,0 +1,126 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.openecomp.mso.cloud.CloudIdentity;
+import org.openecomp.mso.cloud.CloudSite;
+import org.openecomp.mso.openstack.beans.MsoTenant;
+import org.openecomp.mso.openstack.exceptions.MsoException;
+import org.openecomp.mso.properties.MsoJavaProperties;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.woorea.openstack.keystone.Keystone;
+import com.woorea.openstack.keystone.model.Tenant;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MsoKeystoneUtils.class,CloudSite.class,CloudIdentity.class,Tenant.class,Keystone.class,MsoTenant.class,MsoJavaProperties.class})
+public class MsoKeystoneUtilsTest {
+
+ @Mock
+ Tenant tenant;
+
+ @Mock
+ Keystone adminClient;
+
+ @Mock
+ MsoTenant mst;
+
+ @Mock
+ CloudSite cs;
+
+ @Mock
+ CloudIdentity cloudIdentity;
+
+ @Mock
+ MsoJavaProperties msoProps;
+
+ @Test
+ public void testcreateTenant() throws MsoException{
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ Map<String,String>metadata=new HashMap<>();
+ metadata.put("1", "value");
+ PowerMockito.when(tenant.getId ()).thenReturn("ID");
+ doReturn(tenant.getId ()).when(msk).createTenant("tenantName", "cloudSiteId", metadata, true);
+ PowerMockito.spy(tenant.getId ());
+ String Id = msk.createTenant("tenantName", "cloudSiteId", metadata, true);
+ Assert.assertEquals(tenant.getId (), Id);
+ assert(msk.createTenant("tenantName", "cloudSiteId", metadata, true)!=null);
+ }
+ @Test
+ public void testdeleteTenant() throws MsoException{
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ doReturn(true).when(msk).deleteTenant("tenantId", "cloudSiteId");
+ assertTrue(msk.deleteTenant("tenantId", "cloudSiteId"));
+ }
+ @Test
+ public void testfindTenantByName() throws Exception{
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ doReturn(null).when(msk).findTenantByName(adminClient, "tenantName");
+ assertNull(msk.findTenantByName(adminClient, "tenantName"));
+ }
+ @Test
+ public void testqueryTenant() throws MsoException{
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ Map<String,String>metadata=new HashMap<>();
+ metadata.put("1", "value");
+ PowerMockito.when(mst.getTenantId()).thenReturn("tenantId");
+ PowerMockito.when(mst.getMetadata()).thenReturn(metadata);
+ PowerMockito.when(mst.getTenantName()).thenReturn("name");
+ doReturn(mst).when(msk).queryTenant ("tenantId", "cloudSiteId");
+ assertNotNull(msk.queryTenant("tenantId", "cloudSiteId"));
+ }
+
+ @Test
+ public void testqueryTenantByName()throws MsoException {
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ Map<String,String>metadata=new HashMap<>();
+ metadata.put("1", "value");
+ PowerMockito.when(mst.getTenantId()).thenReturn("tenantId");
+ PowerMockito.when(mst.getMetadata()).thenReturn(metadata);
+ PowerMockito.when(mst.getTenantName()).thenReturn("name");
+ doReturn(mst).when(msk).queryTenantByName ("tenantId", "cloudSiteId");
+ assertNotNull(msk.queryTenantByName("tenantId", "cloudSiteId"));
+
+ }
+
+ @Test
+ public void testgetKeystoneAdminClient() throws MsoException{
+ Keystone keystone = new Keystone (cloudIdentity.getKeystoneUrl ("region", "msoPropID"));
+ MsoKeystoneUtils msk = PowerMockito.spy(new MsoKeystoneUtils("ID"));
+ doReturn(keystone).when(msk).getKeystoneAdminClient(cs);
+ assertNotNull(msk.getKeystoneAdminClient(cs));
+ }
+
+ }
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java new file mode 100644 index 0000000000..5c52cb514f --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoNeutronUtilsTest.java @@ -0,0 +1,114 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.openecomp.mso.cloud.CloudConfig;
+import org.openecomp.mso.cloud.CloudConfigFactory;
+import org.openecomp.mso.cloud.CloudSite;
+import org.openecomp.mso.openstack.beans.NetworkInfo;
+import org.openecomp.mso.openstack.exceptions.MsoException;
+import org.openecomp.mso.openstack.utils.MsoNeutronUtils.NetworkType;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.woorea.openstack.quantum.Quantum;
+import com.woorea.openstack.quantum.model.Network;
+import com.woorea.openstack.quantum.model.Segment;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({MsoNeutronUtils.class,MsoCommonUtils.class,NetworkInfo.class,CloudConfigFactory.class,CloudConfig.class,Segment.class,Network.class,Quantum.class})
+public class MsoNeutronUtilsTest{
+
+@Mock
+MsoCommonUtils utils;
+
+@Mock
+NetworkInfo net;
+
+@Mock
+CloudConfig cloudConfig;
+
+@Mock
+Segment segment;
+
+@Mock
+CloudConfigFactory cloudConfigFactory;
+
+@Mock
+Network network;
+
+@Mock
+NetworkInfo ninfo;
+
+@Mock
+Quantum neutronClient;
+
+@Mock
+CloudSite cloudSite;
+
+
+ @Test
+ public void testcreateNetwork() throws MsoException{
+ List<Integer> vlans=new ArrayList();
+ vlans.add(1);
+ MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));
+ NetworkType type=NetworkType.PROVIDER;
+ doReturn(ninfo).when(mnu).createNetwork("cloudSiteId", "tenantId", type, "networkName", "provider", vlans);
+ assert(mnu.createNetwork("cloudSiteId", "tenantId", type, "networkName", "provider", vlans)!=null);
+
+ }
+ @Test
+ public void testqueryNetwork() throws MsoException{
+ MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));
+ doReturn(ninfo).when(mnu).queryNetwork("networkNameOrId", "tenantId", "cloudSiteId");
+ assert(mnu.queryNetwork("networkNameOrId", "tenantId", "cloudSiteId")!=null);
+ }
+
+ @Test
+ public void testdeleteNetwork() throws MsoException{
+ MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));
+ doReturn(true).when(mnu).deleteNetwork("networkId", "tenantId", "cloudSiteId");
+ assertTrue(mnu.deleteNetwork("networkId", "tenantId", "cloudSiteId"));
+
+ }
+ @Test
+ public void testupdateNetwork() throws MsoException{
+ List<Integer> vlans=new ArrayList();
+ vlans.add(1);
+ NetworkType type=NetworkType.PROVIDER;
+ MsoNeutronUtils mnu=PowerMockito.spy(new MsoNeutronUtils("msoProp",cloudConfigFactory));
+ doReturn(ninfo).when(mnu).updateNetwork("cloudSiteId", "tenantId", "Nid", type, "provider", vlans);
+ assert(mnu.updateNetwork("cloudSiteId", "tenantId", "Nid", type, "provider", vlans)!=null);
+ }
+
+ }
+
+
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactoryTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactoryTest.java new file mode 100644 index 0000000000..a759e0d1a6 --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsFactoryTest.java @@ -0,0 +1,44 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
+
+public class MsoTenantUtilsFactoryTest {
+
+ MsoTenantUtils tenantU = null;
+
+ @Test
+ public void test() throws MsoCloudSiteNotFound {
+ tenantU = mock( MsoKeystoneUtils.class);
+ new MsoTenantUtilsFactory("ID");
+ MsoTenantUtilsFactory mti=mock(MsoTenantUtilsFactory.class);
+ mti.getTenantUtils("cloudSiteId");
+ when(mti.getTenantUtils("cloudSiteId")).thenReturn(tenantU);
+ mti.getTenantUtilsByServerType("type");
+ when(mti.getTenantUtilsByServerType("type")).thenReturn(tenantU);
+ }
+
+}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsTest.java new file mode 100644 index 0000000000..ffb1e3b787 --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoTenantUtilsTest.java @@ -0,0 +1,55 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.openecomp.mso.cloud.CloudIdentity;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MsoTenantUtilsTest {
+
+ @Test
+ public void test()throws Exception {
+ MsoTenantUtils mtu =mock(MsoTenantUtils.class);
+ //MsoTenantUtils mki = null;
+ CloudIdentity cloudIdentity=mock(CloudIdentity.class);
+ Map <String, String> metadata=new HashMap<>();
+ mtu.createTenant("name", "id", metadata, true);
+ verify(mtu).createTenant("name", "id", metadata, true);
+ mtu.queryTenant("tenantId", "cloudSiteId");
+ verify(mtu).queryTenant("tenantId", "cloudSiteId");
+ mtu.deleteTenant("tenantId", "cloudSiteId");
+ verify(mtu).deleteTenant("tenantId", "cloudSiteId");
+ mtu.getKeystoneUrl("regionId", "msoPropID", cloudIdentity);
+ verify(mtu).getKeystoneUrl("regionId", "msoPropID", cloudIdentity);
+ mtu.queryTenantByName("tenantName", "cloudSiteId");
+ verify(mtu).queryTenantByName("tenantName", "cloudSiteId");
+
+ }
+}
\ No newline at end of file diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvtTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvtTest.java new file mode 100644 index 0000000000..3dee177dee --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/openstack/utils/MsoYamlEditorWithEnvtTest.java @@ -0,0 +1,70 @@ +/*
+* ============LICENSE_START=======================================================
+* ONAP : SO
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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.openecomp.mso.openstack.utils;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.openecomp.mso.db.catalog.beans.HeatTemplateParam;
+import org.powermock.api.mockito.PowerMockito;
+
+public class MsoYamlEditorWithEnvtTest {
+
+ @Mock
+ MsoHeatEnvironmentParameter mhep;
+
+ @Mock
+ HeatTemplateParam hep;
+
+ @Test
+ public void testgetParameterList() {
+ Set<HeatTemplateParam> paramSet = new HashSet<>();
+ paramSet.add(hep);
+ mhep=PowerMockito.spy(new MsoHeatEnvironmentParameter());
+ MsoYamlEditorWithEnvt Mso=mock(MsoYamlEditorWithEnvt.class);
+ when(Mso.getParameterList()).thenReturn(paramSet);
+ assert(Mso.getParameterList()!=null);
+ }
+
+ @Test
+ public void testgetResourceLisstFromEnvt() {
+ Set<MsoHeatEnvironmentParameter> paramSet = new HashSet<>();
+ paramSet.add(mhep);
+ new MsoHeatEnvironmentResource();;
+ mhep=PowerMockito.spy(new MsoHeatEnvironmentParameter());
+ MsoYamlEditorWithEnvt Mso=mock(MsoYamlEditorWithEnvt.class);
+ when(Mso.getParameterListFromEnvt()).thenReturn(paramSet);
+ }
+
+ @Test
+ public void getParameterListFromEnvt() {
+ mhep=PowerMockito.spy(new MsoHeatEnvironmentParameter());
+ Set<MsoHeatEnvironmentParameter> paramSet = new HashSet<>();
+ paramSet.add(mhep);
+ new MsoHeatEnvironmentResource();;
+ MsoYamlEditorWithEnvt Mso=mock(MsoYamlEditorWithEnvt.class);
+ when(Mso.getParameterListFromEnvt()).thenReturn(paramSet);
+ }
+
+}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/CompareModelsResult.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/CompareModelsResult.java new file mode 100644 index 0000000000..740e89b9d7 --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/CompareModelsResult.java @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved. + * ================================================================================ + * 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.openecomp.mso.bpmn.core.domain; + +import java.io.Serializable; +import java.util.List; + +public class CompareModelsResult extends JsonWrapper implements Serializable +{ + private static final long serialVersionUID = 1L; + + List<ResourceModelInfo> addedResourceList; + List<ResourceModelInfo> deletedResourceList; + List<String> requestInputs; + + public List<ResourceModelInfo> getAddedResourceList() { + return addedResourceList; + } + public void setAddedResourceList(List<ResourceModelInfo> addedResourceList) { + this.addedResourceList = addedResourceList; + } + public List<ResourceModelInfo> getDeletedResourceList() { + return deletedResourceList; + } + public void setDeletedResourceList(List<ResourceModelInfo> deletedResourceList) { + this.deletedResourceList = deletedResourceList; + } + public List<String> getRequestInputs() { + return requestInputs; + } + public void setRequestInputs(List<String> requestInputs) { + this.requestInputs = requestInputs; + } + +} diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceModelInfo.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceModelInfo.java new file mode 100644 index 0000000000..724fe16bdc --- /dev/null +++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceModelInfo.java @@ -0,0 +1,58 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 Huawei Technologies Co., Ltd. All rights reserved. + * ================================================================================ + * 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.openecomp.mso.bpmn.core.domain; + +import java.io.Serializable; + +public class ResourceModelInfo extends JsonWrapper implements Serializable{ + + private static final long serialVersionUID = 1L; + String resourceName; + String resourceInvariantUuid; + String resourceUuid; + String resourceCustomizationUuid; + + public String getResourceName() { + return resourceName; + } + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + public String getResourceInvariantUuid() { + return resourceInvariantUuid; + } + public void setResourceInvariantUuid(String resourceInvariantUuid) { + this.resourceInvariantUuid = resourceInvariantUuid; + } + public String getResourceUuid() { + return resourceUuid; + } + public void setResourceUuid(String resourceUuid) { + this.resourceUuid = resourceUuid; + } + public String getResourceCustomizationUuid() { + return resourceCustomizationUuid; + } + public void setResourceCustomizationUuid(String resourceCustomizationUuid) { + this.resourceCustomizationUuid = resourceCustomizationUuid; + } + +} diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeansTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeansTest.java index 4bd88bed6a..aede3635f6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeansTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeansTest.java @@ -47,7 +47,7 @@ public class BeansTest { @Test public void pojoStructure() { test("org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans"); - test("org.openecomp.mso.apihandlerinfra.taskbeans"); + test("org.openecomp.mso.apihandlerinfra.tasksbeans"); } private void test(String pojoPackage) { @@ -453,12 +453,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <version>1.19</version> @@ -585,6 +579,12 @@ <version>1.2.13</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.10.19</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> </project> |