This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 7c1900d KNOX-2386 - Added CM service discovery support for Apache
Flink (#344)
7c1900d is described below
commit 7c1900dccc403876f703b62d21931d85c4e533bf
Author: Sandor Molnar <[email protected]>
AuthorDate: Fri Jun 12 07:22:17 2020 +0200
KNOX-2386 - Added CM service discovery support for Apache Flink (#344)
---
.../cm/model/flink/FlinkServiceModelGenerator.java | 75 ++++++++++++++++++++++
...way.topology.discovery.cm.ServiceModelGenerator | 1 +
.../flink/FlinkServiceModelGeneratorTest.java | 52 +++++++++++++++
3 files changed, 128 insertions(+)
diff --git
a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGenerator.java
b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGenerator.java
new file mode 100644
index 0000000..4195839
--- /dev/null
+++
b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGenerator.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.knox.gateway.topology.discovery.cm.model.flink;
+
+import java.util.Locale;
+
+import org.apache.knox.gateway.topology.discovery.cm.ServiceModel;
+import org.apache.knox.gateway.topology.discovery.cm.ServiceModel.Type;
+import
org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelGenerator;
+
+import com.cloudera.api.swagger.client.ApiException;
+import com.cloudera.api.swagger.model.ApiConfigList;
+import com.cloudera.api.swagger.model.ApiRole;
+import com.cloudera.api.swagger.model.ApiService;
+import com.cloudera.api.swagger.model.ApiServiceConfig;
+
+public class FlinkServiceModelGenerator extends AbstractServiceModelGenerator {
+
+ static final String SERVICE = "FLINK";
+ static final String SERVICE_TYPE = "FLINK";
+ static final String ROLE_TYPE = "FLINK_HISTORY_SERVER";
+
+ static final String SSL_ENABLED = "ssl_enabled";
+ static final String WEB_PORT = "historyserver_web_port";
+
+ @Override
+ public String getService() {
+ return SERVICE;
+ }
+
+ @Override
+ public String getServiceType() {
+ return SERVICE_TYPE;
+ }
+
+ @Override
+ public String getRoleType() {
+ return ROLE_TYPE;
+ }
+
+ @Override
+ public Type getModelType() {
+ return ServiceModel.Type.UI;
+ }
+
+ @Override
+ public ServiceModel generateService(ApiService service, ApiServiceConfig
serviceConfig, ApiRole role, ApiConfigList roleConfig) throws ApiException {
+ final String hostname = role.getHostRef().getHostname();
+ final String port = getRoleConfigValue(roleConfig, WEB_PORT);
+ final boolean sslEnabled =
Boolean.parseBoolean(getRoleConfigValue(roleConfig, SSL_ENABLED));
+ final String scheme = sslEnabled ? "https" : "http";
+
+ final ServiceModel model =
createServiceModel(String.format(Locale.getDefault(), "%s://%s:%s", scheme,
hostname, port));
+ model.addRoleProperty(getRoleType(), SSL_ENABLED,
Boolean.toString(sslEnabled));
+ model.addRoleProperty(getRoleType(), WEB_PORT, port);
+
+ return model;
+ }
+
+}
diff --git
a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
index 1450fd1..5c1c818 100644
---
a/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
+++
b/gateway-discovery-cm/src/main/resources/META-INF/services/org.apache.knox.gateway.topology.discovery.cm.ServiceModelGenerator
@@ -18,6 +18,7 @@
org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.atlas.AtlasAPIServiceModelGenerator
+org.apache.knox.gateway.topology.discovery.cm.model.flink.FlinkServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hbase.HBaseUIServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hbase.WebHBaseServiceModelGenerator
org.apache.knox.gateway.topology.discovery.cm.model.hdfs.NameNodeServiceModelGenerator
diff --git
a/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGeneratorTest.java
b/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGeneratorTest.java
new file mode 100644
index 0000000..7cccea9
--- /dev/null
+++
b/gateway-discovery-cm/src/test/java/org/apache/knox/gateway/topology/discovery/cm/model/flink/FlinkServiceModelGeneratorTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.knox.gateway.topology.discovery.cm.model.flink;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import
org.apache.knox.gateway.topology.discovery.cm.model.AbstractServiceModelGeneratorTest;
+import org.junit.Test;
+
+public class FlinkServiceModelGeneratorTest extends
AbstractServiceModelGeneratorTest {
+ @Test
+ public void testServiceModelMetadata() {
+ final Map<String, String> serviceConfig = Collections.emptyMap();
+ final Map<String, String> roleConfig = new HashMap<>();
+ roleConfig.put(FlinkServiceModelGenerator.SSL_ENABLED, "true");
+ roleConfig.put(FlinkServiceModelGenerator.WEB_PORT, "8082");
+
+ validateServiceModel(createServiceModel(serviceConfig, roleConfig),
serviceConfig, roleConfig);
+ }
+
+ @Override
+ protected String getServiceType() {
+ return FlinkServiceModelGenerator.SERVICE_TYPE;
+ }
+
+ @Override
+ protected String getRoleType() {
+ return FlinkServiceModelGenerator.ROLE_TYPE;
+ }
+
+ @Override
+ protected FlinkServiceModelGenerator newGenerator() {
+ return new FlinkServiceModelGenerator();
+ }
+}
