diff options
Diffstat (limited to 'openecomp-be')
15 files changed, 403 insertions, 4 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 550b4e610f..be85dc579d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -71,6 +71,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>togglz-rest-services</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.openecomp.sdc.onboarding</groupId> <artifactId>action-library-rest-services</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml index e43fa017d8..495cd3f843 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml @@ -3,7 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -38,6 +39,8 @@ <bean id = "healthCheck" class="org.openecomp.sdcrests.health.rest.services.HealthCheckImpl"/> <bean id = "itemPermissions" class="org.openecomp.sdcrests.itempermissions.rest.services.ItemPermissionsImpl"/> <bean id = "notifications" class="org.openecomp.sdcrests.notifications.rest.services.impl.NotificationsImpl"/> + <bean id = "togglz" class="org.openecomp.sdcrests.togglz.rest.services.TogglzFeaturesImpl"/> + <!-- RESTful Services --> <jaxrs:server id="restContainer" address="/"> @@ -69,6 +72,7 @@ <ref bean="healthCheck"/> <ref bean="itemPermissions"/> <ref bean="notifications"/> + <ref bean="togglz"/> </jaxrs:serviceBeans> <jaxrs:providers> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml index d44e0c8b98..e7f1b62956 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/pom.xml @@ -28,6 +28,7 @@ <module>item-rest</module> <module>notifications-fe</module> <module>notifications-rest</module> + <module>togglz-rest</module> </modules> </project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml new file mode 100644 index 0000000000..fb786f2089 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/pom.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-rest-webapp</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <artifactId>togglz-rest</artifactId> + <packaging>pom</packaging> + + + <modules> + <module>togglz-rest-types</module> + <module>togglz-rest-services</module> + </modules> + +</project>
\ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml new file mode 100644 index 0000000000..baad898ff1 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/pom.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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.openecomp.sdc</groupId> + <artifactId>togglz-rest</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <artifactId>togglz-rest-services</artifactId> + <dependencies> + + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${ws.rs.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.framework.version}</version> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${javax.inject.version}</version> + </dependency> + <dependency> + <groupId>org.openecomp.sdc.core</groupId> + <artifactId>openecomp-common-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>togglz-rest-types</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-common-rest</artifactId> + <version>${project.version}</version> + </dependency> + <!-- CXF --> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + <version>${mockito.all.version}</version> + </dependency> + </dependencies> + + +</project>
\ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/TogglzFeatures.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/TogglzFeatures.java new file mode 100644 index 0000000000..9a1fde3d9c --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/TogglzFeatures.java @@ -0,0 +1,44 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.togglz.rest; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.openecomp.sdcrests.togglz.types.FeatureSetDto; +import org.springframework.validation.annotation.Validated; + +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +@Path("/v1.0/togglz") +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +@Api(value = "TOGGLZ") +@Validated +public interface TogglzFeatures { + + @GET + @ApiOperation(value = "Get TOGGLZ Features", + response = FeatureSetDto.class, + responseContainer = "List") + Response getFeatures(); + +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java new file mode 100644 index 0000000000..769622d35e --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java @@ -0,0 +1,40 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ +package org.openecomp.sdcrests.togglz.rest.mapping; + +import org.openecomp.sdcrests.mapping.MappingBase; +import org.openecomp.sdcrests.togglz.types.FeatureDto; +import org.openecomp.sdcrests.togglz.types.FeatureSetDto; + +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; +import org.openecomp.sdc.common.togglz.ToggleStatus; + +public class MapToggleableFeatureToDto extends MappingBase<Collection<ToggleStatus>, FeatureSetDto> { + + @Override + public void doMapping(Collection<ToggleStatus> source, FeatureSetDto target) { + if (source != null && !source.isEmpty()){ + Set<FeatureDto> fDtos = source.stream().map(f -> new FeatureDto(f.name(), f.isActive())) + .collect(Collectors.toSet()); + target.setFeatures(fDtos); + } else { + target.setFeatures(Collections.emptySet()); + } + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/services/TogglzFeaturesImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/services/TogglzFeaturesImpl.java new file mode 100644 index 0000000000..5b7240be54 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/services/TogglzFeaturesImpl.java @@ -0,0 +1,42 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ + +package org.openecomp.sdcrests.togglz.rest.services; + +import org.openecomp.sdc.common.togglz.ToggleableFeature; +import org.openecomp.sdcrests.togglz.rest.TogglzFeatures; +import org.openecomp.sdcrests.togglz.rest.mapping.MapToggleableFeatureToDto; +import org.openecomp.sdcrests.togglz.types.FeatureSetDto; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Service; + +import javax.inject.Named; +import javax.ws.rs.core.Response; +import java.util.Arrays; + +@Named +@Service("TogglzFeature") +@Scope(value = "prototype") +public class TogglzFeaturesImpl implements TogglzFeatures { + + @Override + public Response getFeatures() { + FeatureSetDto featureSetDto = new FeatureSetDto(); + new MapToggleableFeatureToDto().doMapping(Arrays.asList(ToggleableFeature.values()), featureSetDto); + return Response.ok(featureSetDto).build(); + } +} + diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java new file mode 100644 index 0000000000..b8f3286823 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java @@ -0,0 +1,59 @@ +package org.openecomp; + +import com.google.common.collect.Sets; +import org.junit.Test; +import org.openecomp.sdc.common.togglz.ToggleStatus; +import org.openecomp.sdc.common.togglz.ToggleableFeature; +import org.openecomp.sdcrests.togglz.rest.TogglzFeatures; +import org.openecomp.sdcrests.togglz.rest.mapping.MapToggleableFeatureToDto; +import org.openecomp.sdcrests.togglz.rest.services.TogglzFeaturesImpl; +import org.openecomp.sdcrests.togglz.types.FeatureDto; +import org.openecomp.sdcrests.togglz.types.FeatureSetDto; + +import javax.ws.rs.core.Response; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class TogglzFeatureRestTest { + + @Test + public void shouldConvertDataProperly() { + ToggleStatus tf = mock(ToggleStatus.class); + final String TF_NAME = "tf"; + final boolean ACTIVE = true; + when(tf.name()).thenReturn(TF_NAME); + when(tf.isActive()).thenReturn(ACTIVE); + MapToggleableFeatureToDto mapToggleableFeatureToDto = new MapToggleableFeatureToDto(); + FeatureSetDto target = new FeatureSetDto(); + Collection<ToggleStatus> source = Collections.singletonList(tf); + mapToggleableFeatureToDto.doMapping(source, target); + assertEquals(source.size(), target.getFeatures().size()); + FeatureDto result = target.getFeatures().iterator().next(); + assertEquals(TF_NAME, result.getName()); + assertEquals(ACTIVE, result.isActive()); + + } + + @Test + public void shouldGetCurrentTogglzValues() { + TogglzFeatures togglzFeature = new TogglzFeaturesImpl(); + Response response = togglzFeature.getFeatures(); + assertNotNull(response); + Object entity = response.getEntity(); + assertEquals(entity.getClass(), FeatureSetDto.class); + Set<FeatureDto> features = ((FeatureSetDto) entity).getFeatures(); + assertEquals(features.size(), ToggleableFeature.values().length); + Set<String> names = Arrays.stream(ToggleableFeature.values()).map(Enum::name).collect(Collectors.toSet()); + Set<String> dtoNames = features.stream().map(FeatureDto::getName).collect(Collectors.toSet()); + assertTrue(Sets.symmetricDifference(names, dtoNames).isEmpty()); + } +}
\ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml new file mode 100644 index 0000000000..ac264de509 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/pom.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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.openecomp.sdc</groupId> + <artifactId>togglz-rest</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + + <artifactId>togglz-rest-types</artifactId> + +</project>
\ No newline at end of file diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureDto.java new file mode 100644 index 0000000000..d6e2fbd669 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureDto.java @@ -0,0 +1,55 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ +package org.openecomp.sdcrests.togglz.types; + +import java.util.Objects; + +public class FeatureDto { + + private final String name; + private final boolean active; + + public FeatureDto(String name, boolean active) { + this.name = name; + this.active = active; + } + + public String getName() { + return name; + } + + public boolean isActive() { + return active; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof FeatureDto)) return false; + FeatureDto that = (FeatureDto) o; + return Objects.equals(getName(), that.getName()); + } + + @Override + public int hashCode() { + return Objects.hash(getName()); + } + + @Override + public String toString() { + return "FeatureDto{name='" + name + '\'' + ", active=" + active + '}'; + } +} diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureSetDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureSetDto.java new file mode 100644 index 0000000000..cf7ee71a35 --- /dev/null +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-types/src/main/java/org/openecomp/sdcrests/togglz/types/FeatureSetDto.java @@ -0,0 +1,36 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * 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. + */ +package org.openecomp.sdcrests.togglz.types; + +import java.util.Set; + +public class FeatureSetDto { + + private Set<FeatureDto> features; + + public Set<FeatureDto> getFeatures() { + return features; + } + + public void setFeatures(Set<FeatureDto> features) { + this.features = features; + } + + @Override + public String toString() { + return "FeatureSetDto{features=" + features + '}'; + } +} diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java new file mode 100644 index 0000000000..e72f85a652 --- /dev/null +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java @@ -0,0 +1,7 @@ +package org.openecomp.sdc.common.togglz; + +import org.togglz.core.Feature; + +public interface ToggleStatus extends Feature { + boolean isActive(); +} diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java index aab9845573..cae1033b52 100644 --- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java +++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java @@ -1,14 +1,14 @@ package org.openecomp.sdc.common.togglz; -import org.togglz.core.Feature; import org.togglz.core.annotation.Label; import org.togglz.core.context.FeatureContext; -public enum ToggleableFeature implements Feature { +public enum ToggleableFeature implements ToggleStatus { @Label ("Forwarder Capability") FORWARDER_CAPABILITY; + @Override public boolean isActive() { return FeatureContext.getFeatureManager().isActive(this); } diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/types/LoggerServiceName.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/types/LoggerServiceName.java index 1a9d327414..6722bc4cd9 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/types/LoggerServiceName.java +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/types/LoggerServiceName.java @@ -168,7 +168,8 @@ public enum LoggerServiceName { GET_COMPONENT_DEPENDENCY, Health_check, - notifications + notifications, + TOGGLZ ; public static String getServiceName(LoggerServiceName serviceName) { |