Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
65893268
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
65893268
编写于
3月 24, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
查询资源池
上级
fdb6d690
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
30 addition
and
0 deletion
+30
-0
backend/src/main/java/io/metersphere/engine/EngineContext.java
...nd/src/main/java/io/metersphere/engine/EngineContext.java
+9
-0
backend/src/main/java/io/metersphere/engine/EngineFactory.java
...nd/src/main/java/io/metersphere/engine/EngineFactory.java
+3
-0
backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java
...o/metersphere/engine/kubernetes/KubernetesTestEngine.java
+12
-0
backend/src/main/java/io/metersphere/service/TestResourceService.java
...main/java/io/metersphere/service/TestResourceService.java
+6
-0
未找到文件。
backend/src/main/java/io/metersphere/engine/EngineContext.java
浏览文件 @
65893268
...
...
@@ -9,6 +9,7 @@ public class EngineContext {
private
String
namespace
;
private
String
fileType
;
private
String
content
;
private
String
resourcePoolId
;
private
Map
<
String
,
Object
>
properties
=
new
HashMap
<>();
private
Map
<
String
,
String
>
testData
=
new
HashMap
<>();
...
...
@@ -67,4 +68,12 @@ public class EngineContext {
public
void
setTestData
(
Map
<
String
,
String
>
testData
)
{
this
.
testData
=
testData
;
}
public
String
getResourcePoolId
()
{
return
resourcePoolId
;
}
public
void
setResourcePoolId
(
String
resourcePoolId
)
{
this
.
resourcePoolId
=
resourcePoolId
;
}
}
backend/src/main/java/io/metersphere/engine/EngineFactory.java
浏览文件 @
65893268
...
...
@@ -79,6 +79,9 @@ public class EngineFactory {
for
(
int
i
=
0
;
i
<
jsonArray
.
size
();
i
++)
{
final
JSONObject
jsonObject
=
jsonArray
.
getJSONObject
(
i
);
engineContext
.
addProperty
(
jsonObject
.
getString
(
"key"
),
jsonObject
.
get
(
"value"
));
if
(
StringUtils
.
equals
(
jsonObject
.
getString
(
"key"
),
"resourcePoolId"
))
{
engineContext
.
setResourcePoolId
(
jsonObject
.
getString
(
"value"
));
}
}
}
...
...
backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java
浏览文件 @
65893268
...
...
@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON;
import
io.fabric8.kubernetes.api.model.ConfigMap
;
import
io.fabric8.kubernetes.api.model.ObjectMeta
;
import
io.fabric8.kubernetes.client.KubernetesClient
;
import
io.metersphere.base.domain.TestResource
;
import
io.metersphere.base.domain.TestResourcePool
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.commons.utils.CommonBeanFactory
;
import
io.metersphere.commons.utils.LogUtil
;
import
io.metersphere.engine.Engine
;
...
...
@@ -13,19 +16,23 @@ import io.metersphere.engine.kubernetes.crds.jmeter.JmeterSpec;
import
io.metersphere.engine.kubernetes.provider.ClientCredential
;
import
io.metersphere.engine.kubernetes.provider.KubernetesProvider
;
import
io.metersphere.service.TestResourcePoolService
;
import
io.metersphere.service.TestResourceService
;
import
org.apache.commons.collections.MapUtils
;
import
java.util.HashMap
;
import
java.util.List
;
public
class
KubernetesTestEngine
implements
Engine
{
private
EngineContext
context
;
private
TestResourcePoolService
testResourcePoolService
;
private
TestResourceService
testResourceService
;
@Override
public
boolean
init
(
EngineContext
context
)
{
// todo 初始化操作
this
.
context
=
context
;
this
.
testResourcePoolService
=
CommonBeanFactory
.
getBean
(
TestResourcePoolService
.
class
);
this
.
testResourceService
=
CommonBeanFactory
.
getBean
(
TestResourceService
.
class
);
return
true
;
}
...
...
@@ -36,6 +43,11 @@ public class KubernetesTestEngine implements Engine {
LogUtil
.
warn
(
"Please initial the engine."
);
return
;
}
TestResourcePool
resourcePool
=
testResourcePoolService
.
getResourcePool
(
context
.
getResourcePoolId
());
if
(
resourcePool
==
null
)
{
MSException
.
throwException
(
"Resource Pool is empty"
);
}
List
<
TestResource
>
resourceList
=
testResourceService
.
getResourcesByPoolId
(
resourcePool
.
getId
());
// todo 运行测试
ClientCredential
credential
=
new
ClientCredential
();
credential
.
setMasterUrl
(
"https://172.16.10.93:6443"
);
...
...
backend/src/main/java/io/metersphere/service/TestResourceService.java
浏览文件 @
65893268
...
...
@@ -41,4 +41,10 @@ public class TestResourceService {
testResource
.
setUpdateTime
(
System
.
currentTimeMillis
());
testResourceMapper
.
updateByPrimaryKeySelective
(
testResource
);
}
public
List
<
TestResource
>
getResourcesByPoolId
(
String
resourcePoolId
)
{
TestResourceExample
example
=
new
TestResourceExample
();
example
.
createCriteria
().
andTestResourcePoolIdEqualTo
(
resourcePoolId
);
return
testResourceMapper
.
selectByExampleWithBLOBs
(
example
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录