@@ -14,9 +14,9 @@ import (
14
14
osgraphtest "github.com/openshift/origin/pkg/api/graph/test"
15
15
kubeedges "github.com/openshift/origin/pkg/api/kubegraph"
16
16
kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
17
- deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
18
- deployedges "github.com/openshift/origin/pkg/apps/graph"
19
- deploygraph "github.com/openshift/origin/pkg/apps/graph/nodes"
17
+ appsapi "github.com/openshift/origin/pkg/apps/apis/apps"
18
+ appsedges "github.com/openshift/origin/pkg/apps/graph"
19
+ appsgraph "github.com/openshift/origin/pkg/apps/graph/nodes"
20
20
buildapi "github.com/openshift/origin/pkg/build/apis/build"
21
21
buildedges "github.com/openshift/origin/pkg/build/graph"
22
22
buildgraph "github.com/openshift/origin/pkg/build/graph/nodes"
@@ -31,7 +31,7 @@ func TestServiceGroup(t *testing.T) {
31
31
32
32
kubeedges .AddAllExposedPodTemplateSpecEdges (g )
33
33
buildedges .AddAllInputOutputEdges (g )
34
- deployedges .AddAllTriggerEdges (g )
34
+ appsedges .AddAllTriggerEdges (g )
35
35
36
36
coveredNodes := IntSet {}
37
37
@@ -104,7 +104,7 @@ func TestBareDCGroup(t *testing.T) {
104
104
105
105
kubeedges .AddAllExposedPodTemplateSpecEdges (g )
106
106
buildedges .AddAllInputOutputEdges (g )
107
- deployedges .AddAllTriggerEdges (g )
107
+ appsedges .AddAllTriggerEdges (g )
108
108
109
109
coveredNodes := IntSet {}
110
110
@@ -160,7 +160,7 @@ func TestBareBCGroup(t *testing.T) {
160
160
161
161
kubeedges .AddAllExposedPodTemplateSpecEdges (g )
162
162
buildedges .AddAllInputOutputEdges (g )
163
- deployedges .AddAllTriggerEdges (g )
163
+ appsedges .AddAllTriggerEdges (g )
164
164
165
165
coveredNodes := IntSet {}
166
166
@@ -286,12 +286,12 @@ func TestGraph(t *testing.T) {
286
286
},
287
287
},
288
288
})
289
- deploygraph .EnsureDeploymentConfigNode (g , & deployapi .DeploymentConfig {
289
+ appsgraph .EnsureDeploymentConfigNode (g , & appsapi .DeploymentConfig {
290
290
ObjectMeta : metav1.ObjectMeta {Namespace : "other" , Name : "deploy1" },
291
- Spec : deployapi .DeploymentConfigSpec {
292
- Triggers : []deployapi .DeploymentTriggerPolicy {
291
+ Spec : appsapi .DeploymentConfigSpec {
292
+ Triggers : []appsapi .DeploymentTriggerPolicy {
293
293
{
294
- ImageChangeParams : & deployapi .DeploymentTriggerImageChangeParams {
294
+ ImageChangeParams : & appsapi .DeploymentTriggerImageChangeParams {
295
295
From : kapi.ObjectReference {Kind : "ImageStreamTag" , Namespace : "default" , Name : "other:tag1" },
296
296
ContainerNames : []string {"1" , "2" },
297
297
},
@@ -323,9 +323,9 @@ func TestGraph(t *testing.T) {
323
323
},
324
324
},
325
325
})
326
- deploygraph .EnsureDeploymentConfigNode (g , & deployapi .DeploymentConfig {
326
+ appsgraph .EnsureDeploymentConfigNode (g , & appsapi .DeploymentConfig {
327
327
ObjectMeta : metav1.ObjectMeta {Namespace : "default" , Name : "deploy2" },
328
- Spec : deployapi .DeploymentConfigSpec {
328
+ Spec : appsapi .DeploymentConfigSpec {
329
329
Template : & kapi.PodTemplateSpec {
330
330
ObjectMeta : metav1.ObjectMeta {
331
331
Labels : map [string ]string {
@@ -348,8 +348,8 @@ func TestGraph(t *testing.T) {
348
348
kubeedges .AddAllExposedPodTemplateSpecEdges (g )
349
349
buildedges .AddAllInputOutputEdges (g )
350
350
buildedges .AddAllBuildEdges (g )
351
- deployedges .AddAllTriggerEdges (g )
352
- deployedges .AddAllDeploymentEdges (g )
351
+ appsedges .AddAllTriggerEdges (g )
352
+ appsedges .AddAllDeploymentEdges (g )
353
353
354
354
t .Log (g )
355
355
0 commit comments