Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
凌波微步_大先生
dashboard
提交
8a7453f5
D
dashboard
项目概览
凌波微步_大先生
/
dashboard
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dashboard
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8a7453f5
编写于
2月 02, 2016
作者:
P
Piotr Bryk
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #321 from batikanu/fix-deploy-file-test
Update deploy file test
上级
ec91b7a5
e5dc474e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
16 deletion
+25
-16
src/app/backend/apihandler.go
src/app/backend/apihandler.go
+6
-6
src/app/backend/deploy.go
src/app/backend/deploy.go
+10
-4
src/test/backend/deploy_test.go
src/test/backend/deploy_test.go
+9
-6
未找到文件。
src/app/backend/apihandler.go
浏览文件 @
8a7453f5
...
...
@@ -87,13 +87,13 @@ func CreateHttpApiHandler(client *client.Client, heapsterClient HeapsterClient)
deployFromFileWs
:=
new
(
restful
.
WebService
)
deployFromFileWs
.
Path
(
"/api/appdeploymentfromfile"
)
.
Consumes
(
restful
.
MIME_JSON
)
.
Produces
(
restful
.
MIME_JSON
)
Consumes
(
restful
.
MIME_JSON
)
.
Produces
(
restful
.
MIME_JSON
)
deployFromFileWs
.
Route
(
deployFromFileWs
.
POST
(
""
)
.
To
(
apiHandler
.
handleDeployFromFile
)
.
Reads
(
AppDeploymentFromFileSpec
{})
.
Writes
(
AppDeploymentFromFileSpec
{}))
To
(
apiHandler
.
handleDeployFromFile
)
.
Reads
(
AppDeploymentFromFileSpec
{})
.
Writes
(
AppDeploymentFromFileSpec
{}))
wsContainer
.
Add
(
deployFromFileWs
)
replicaSetWs
:=
new
(
restful
.
WebService
)
...
...
@@ -205,7 +205,7 @@ func (apiHandler *ApiHandler) handleDeployFromFile(request *restful.Request, res
handleInternalError
(
response
,
err
)
return
}
if
err
:=
DeployAppFromFile
(
deploymentSpec
);
err
!=
nil
{
if
err
:=
DeployAppFromFile
(
deploymentSpec
,
CreateObjectFromInfoFn
);
err
!=
nil
{
handleInternalError
(
response
,
err
)
return
}
...
...
src/app/backend/deploy.go
浏览文件 @
8a7453f5
...
...
@@ -243,8 +243,16 @@ func getLabelsMap(labels []Label) map[string]string {
return
result
}
type
createObjectFromInfo
func
(
info
*
kubectlResource
.
Info
)
error
// Implementation of createObjectFromInfo
var
CreateObjectFromInfoFn
=
func
(
info
*
kubectlResource
.
Info
)
error
{
_
,
err
:=
kubectlResource
.
NewHelper
(
info
.
Client
,
info
.
Mapping
)
.
Create
(
info
.
Namespace
,
true
,
info
.
Object
)
return
err
}
// Deploys an app based on the given yaml or json file.
func
DeployAppFromFile
(
spec
*
AppDeploymentFromFileSpec
)
error
{
func
DeployAppFromFile
(
spec
*
AppDeploymentFromFileSpec
,
createObjectFromInfoFn
createObjectFromInfo
)
error
{
const
(
validate
=
true
emptyCacheDir
=
""
...
...
@@ -267,8 +275,7 @@ func DeployAppFromFile(spec *AppDeploymentFromFileSpec) error {
Do
()
return
r
.
Visit
(
func
(
info
*
kubectlResource
.
Info
,
err
error
)
error
{
// creates an object from input info
_
,
err
=
kubectlResource
.
NewHelper
(
info
.
Client
,
info
.
Mapping
)
.
Create
(
info
.
Namespace
,
true
,
info
.
Object
)
err
=
createObjectFromInfoFn
(
info
)
if
err
!=
nil
{
return
err
}
...
...
@@ -276,4 +283,3 @@ func DeployAppFromFile(spec *AppDeploymentFromFileSpec) error {
return
nil
})
}
src/test/backend/deploy_test.go
浏览文件 @
8a7453f5
...
...
@@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/client/unversioned/testclient"
kubectlResource
"k8s.io/kubernetes/pkg/kubectl/resource"
)
func
TestDeployApp
(
t
*
testing
.
T
)
{
...
...
@@ -161,19 +162,21 @@ func TestGetAvailableProtocols(t *testing.T) {
}
func
TestDeployAppFromFileWithValidContent
(
t
*
testing
.
T
)
{
const
(
testNamespace
=
"test-deployfile-namespace"
)
validContent
:=
"{
\"
kind
\"
:
\"
Namespace
\"
,"
+
"
\"
apiVersion
\"
:
\"
v1
\"
,"
+
"
\"
metadata
\"
: {"
+
"
\"
name
\"
:
\"
development
\"
,"
+
"
\"
name
\"
:
\"
"
+
testNamespace
+
"
\"
,"
+
"
\"
labels
\"
: {
\"
name
\"
:
\"
development
\"
}}}"
spec
:=
&
AppDeploymentFromFileSpec
{
Name
:
"foo-name"
,
Content
:
validContent
,
}
fakeCreateObjectFromInfo
:=
func
(
info
*
kubectlResource
.
Info
)
error
{
return
nil
}
err
:=
DeployAppFromFile
(
spec
)
err
:=
DeployAppFromFile
(
spec
,
fakeCreateObjectFromInfo
)
if
err
!=
nil
{
t
.
Errorf
(
"Expected return value to be %#v but got %#v"
,
nil
,
err
)
}
...
...
@@ -184,9 +187,9 @@ func TestDeployAppFromFileWithInvalidContent(t *testing.T) {
Name
:
"foo-name"
,
Content
:
"foo-content-invalid"
,
}
fakeCreateObjectFromInfo
:=
func
(
info
*
kubectlResource
.
Info
)
error
{
return
nil
}
err
:=
DeployAppFromFile
(
spec
)
err
:=
DeployAppFromFile
(
spec
,
fakeCreateObjectFromInfo
)
if
err
==
nil
{
t
.
Errorf
(
"Expected return value to be an error but got %#v"
,
nil
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录