Skip to content

Commit d28a705

Browse files
craigcarl-oraclecraigcarl-oracle
committed
more merge cleanup
1 parent 391fd48 commit d28a705

File tree

7 files changed

+0
-108
lines changed

7 files changed

+0
-108
lines changed

‎core/volume_resource.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ func VolumeResource() *schema.Resource {
2525
Required: true,
2626
ForceNew: true,
2727
},
28-
<<<<<<< HEAD
2928
"size_in_mbs": {
3029
Type: schema.TypeInt,
3130
Optional: true,
3231
ForceNew: true,
3332
},
34-
=======
35-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
3633
"display_name": {
3734
Type: schema.TypeString,
3835
Computed: true,
@@ -42,13 +39,6 @@ func VolumeResource() *schema.Resource {
4239
Type: schema.TypeString,
4340
Computed: true,
4441
},
45-
<<<<<<< HEAD
46-
=======
47-
"size_in_mbs": {
48-
Type: schema.TypeString,
49-
Computed: true,
50-
},
51-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
5242
"state": {
5343
Type: schema.TypeString,
5444
Computed: true,

‎core/volume_resource_crud.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ func (s *VolumeResourceCrud) Create() (e error) {
4646
if ok {
4747
opts.DisplayName = displayName.(string)
4848
}
49-
<<<<<<< HEAD
5049
sizeInMBs, ok := s.D.GetOk("size_in_mbs")
5150
if ok {
5251
opts.SizeInMBs = sizeInMBs.(int)
5352
}
54-
=======
55-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
5653

5754
s.Res, e = s.Client.CreateVolume(availabilityDomain, compartmentID, opts)
5855

‎core_volume_datasource_test.go‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumes() {
6363
CompartmentID: "compartment_id",
6464
DisplayName: "display_name",
6565
ID: "id1",
66-
<<<<<<< HEAD
6766
SizeInMBs: 123,
68-
=======
69-
SizeInMBs: "size_in_mbs",
70-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
7167
State: baremetal.ResourceAvailable,
7268
TimeCreated: baremetal.Time{Time: time.Now()},
7369
},
@@ -76,11 +72,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumes() {
7672
CompartmentID: "compartment_id",
7773
DisplayName: "display_name",
7874
ID: "id2",
79-
<<<<<<< HEAD
8075
SizeInMBs: 123,
81-
=======
82-
SizeInMBs: "size_in_mbs",
83-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
8476
State: baremetal.ResourceAvailable,
8577
TimeCreated: baremetal.Time{Time: time.Now()},
8678
},
@@ -127,11 +119,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumesWithPagination() {
127119
CompartmentID: "compartment_id",
128120
DisplayName: "display_name",
129121
ID: "id1",
130-
<<<<<<< HEAD
131122
SizeInMBs: 123,
132-
=======
133-
SizeInMBs: "size_in_mbs",
134-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
135123
State: baremetal.ResourceAvailable,
136124
TimeCreated: baremetal.Time{Time: time.Now()},
137125
},
@@ -140,11 +128,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumesWithPagination() {
140128
CompartmentID: "compartment_id",
141129
DisplayName: "display_name",
142130
ID: "id2",
143-
<<<<<<< HEAD
144131
SizeInMBs: 123,
145-
=======
146-
SizeInMBs: "size_in_mbs",
147-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
148132
State: baremetal.ResourceAvailable,
149133
TimeCreated: baremetal.Time{Time: time.Now()},
150134
},
@@ -173,11 +157,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumesWithPagination() {
173157
CompartmentID: "compartment_id",
174158
DisplayName: "display_name",
175159
ID: "id3",
176-
<<<<<<< HEAD
177160
SizeInMBs: 123,
178-
=======
179-
SizeInMBs: "size_in_mbs",
180-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
181161
State: baremetal.ResourceAvailable,
182162
TimeCreated: baremetal.Time{Time: time.Now()},
183163
},
@@ -186,11 +166,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumesWithPagination() {
186166
CompartmentID: "compartment_id",
187167
DisplayName: "display_name",
188168
ID: "id4",
189-
<<<<<<< HEAD
190169
SizeInMBs: 123,
191-
=======
192-
SizeInMBs: "size_in_mbs",
193-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
194170
State: baremetal.ResourceAvailable,
195171
TimeCreated: baremetal.Time{Time: time.Now()},
196172
},

‎core_volume_test.go‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ import (
1313
"github.com/hashicorp/terraform/terraform"
1414

1515
"github.com/stretchr/testify/suite"
16-
<<<<<<< HEAD
1716
//"strconv"
18-
=======
19-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
2017
)
2118

2219
type ResourceCoreVolumeTestSuite struct {
@@ -51,10 +48,7 @@ func (s *ResourceCoreVolumeTestSuite) SetupTest() {
5148
availability_domain = "availability_domain"
5249
compartment_id = "compartment_id"
5350
display_name = "display_name"
54-
<<<<<<< HEAD
5551
size_in_mbs = 123
56-
=======
57-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
5852
}
5953
`
6054

@@ -66,11 +60,7 @@ func (s *ResourceCoreVolumeTestSuite) SetupTest() {
6660
CompartmentID: "compartment_id",
6761
DisplayName: "display_name",
6862
ID: "id",
69-
<<<<<<< HEAD
7063
SizeInMBs: 123,
71-
=======
72-
SizeInMBs: "size_in_mbs",
73-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
7464
State: baremetal.ResourceAvailable,
7565
TimeCreated: s.TimeCreated,
7666
}
@@ -82,11 +72,7 @@ func (s *ResourceCoreVolumeTestSuite) SetupTest() {
8272
CompartmentID: "compartment_id",
8373
DisplayName: "display_name",
8474
ID: "id",
85-
<<<<<<< HEAD
8675
SizeInMBs: 123,
87-
=======
88-
SizeInMBs: "size_in_mbs",
89-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
9076
State: baremetal.ResourceTerminated,
9177
TimeCreated: s.TimeCreated,
9278
}
@@ -95,10 +81,7 @@ func (s *ResourceCoreVolumeTestSuite) SetupTest() {
9581

9682
opts := &baremetal.CreateVolumeOptions{}
9783
opts.DisplayName = "display_name"
98-
<<<<<<< HEAD
9984
opts.SizeInMBs = 123
100-
=======
101-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
10285
s.Client.On(
10386
"CreateVolume",
10487
"availability_domain",
@@ -121,11 +104,7 @@ func (s *ResourceCoreVolumeTestSuite) TestCreateResourceCoreVolume() {
121104
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", s.Res.CompartmentID),
122105
resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Res.DisplayName),
123106
resource.TestCheckResourceAttr(s.ResourceName, "id", s.Res.ID),
124-
<<<<<<< HEAD
125107
//resource.TestCheckResourceAttr(s.ResourceName, "size_in_mbs", strconv.Itoa(s.Res.SizeInMBs)),
126-
=======
127-
resource.TestCheckResourceAttr(s.ResourceName, "size_in_mbs", s.Res.SizeInMBs),
128-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
129108
resource.TestCheckResourceAttr(s.ResourceName, "state", s.Res.State),
130109
resource.TestCheckResourceAttr(s.ResourceName, "time_created", s.Res.TimeCreated.String()),
131110
),
@@ -141,19 +120,12 @@ func (s *ResourceCoreVolumeTestSuite) TestCreateResourceCoreVolumeWithoutDisplay
141120
resource "baremetal_core_volume" "t" {
142121
availability_domain = "availability_domain"
143122
compartment_id = "compartment_id"
144-
<<<<<<< HEAD
145123
size_in_mbs = 123
146-
=======
147-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
148124
}
149125
`
150126
s.Config += testProviderConfig
151127

152-
<<<<<<< HEAD
153128
opts := &baremetal.CreateVolumeOptions{SizeInMBs: 123}
154-
=======
155-
opts := &baremetal.CreateVolumeOptions{}
156-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
157129
s.Client.On(
158130
"CreateVolume",
159131
"availability_domain",
@@ -180,10 +152,7 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateVolumeDisplayName() {
180152
availability_domain = "availability_domain"
181153
compartment_id = "compartment_id"
182154
display_name = "new_display_name"
183-
<<<<<<< HEAD
184155
size_in_mbs = 123
185-
=======
186-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
187156
}
188157
`
189158
config += testProviderConfig
@@ -193,11 +162,7 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateVolumeDisplayName() {
193162
CompartmentID: "compartment_id",
194163
DisplayName: "new_display_name",
195164
ID: "id",
196-
<<<<<<< HEAD
197165
SizeInMBs: 123,
198-
=======
199-
SizeInMBs: "size_in_mbs",
200-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
201166
State: baremetal.ResourceAvailable,
202167
TimeCreated: s.TimeCreated,
203168
}
@@ -232,10 +197,7 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateAvailabilityDomainForcesNewVolume
232197
resource "baremetal_core_volume" "t" {
233198
availability_domain = "new_availability_domain"
234199
compartment_id = "compartment_id"
235-
<<<<<<< HEAD
236200
size_in_mbs = 123
237-
=======
238-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
239201
}
240202
`
241203
config += testProviderConfig
@@ -245,22 +207,14 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateAvailabilityDomainForcesNewVolume
245207
CompartmentID: "compartment_id",
246208
DisplayName: "display_name",
247209
ID: "new_id",
248-
<<<<<<< HEAD
249210
SizeInMBs: 123,
250-
=======
251-
SizeInMBs: "size_in_mbs",
252-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
253211
State: baremetal.ResourceAvailable,
254212
TimeCreated: s.TimeCreated,
255213
}
256214
res.ETag = "etag"
257215
res.RequestID = "opcrequestid"
258216

259-
<<<<<<< HEAD
260217
opts := &baremetal.CreateVolumeOptions{SizeInMBs: 123}
261-
=======
262-
opts := &baremetal.CreateVolumeOptions{}
263-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
264218
s.Client.On(
265219
"CreateVolume",
266220
res.AvailabilityDomain,
@@ -292,10 +246,7 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateCompartmentIdForcesNewVolume() {
292246
resource "baremetal_core_volume" "t" {
293247
availability_domain = "availability_domain"
294248
compartment_id = "new_compartment_id"
295-
<<<<<<< HEAD
296249
size_in_mbs = 123
297-
=======
298-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
299250
}
300251
`
301252
config += testProviderConfig
@@ -305,22 +256,14 @@ func (s ResourceCoreVolumeTestSuite) TestUpdateCompartmentIdForcesNewVolume() {
305256
CompartmentID: "new_compartment_id",
306257
DisplayName: "display_name",
307258
ID: "new_id",
308-
<<<<<<< HEAD
309259
SizeInMBs: 123,
310-
=======
311-
SizeInMBs: "size_in_mbs",
312-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
313260
State: baremetal.ResourceAvailable,
314261
TimeCreated: s.TimeCreated,
315262
}
316263
res.ETag = "etag"
317264
res.RequestID = "opcrequestid"
318265

319-
<<<<<<< HEAD
320266
opts := &baremetal.CreateVolumeOptions{SizeInMBs: 123}
321-
=======
322-
opts := &baremetal.CreateVolumeOptions{}
323-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
324267
s.Client.On(
325268
"CreateVolume",
326269
res.AvailabilityDomain,

‎vendor/github.com/MustWin/baremetal-sdk-go/core_volume.go‎

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/MustWin/baremetal-sdk-go/request_options.go‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/vendor.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -315,17 +315,10 @@
315315
"revisionTime": "2017-02-01T00:43:30Z"
316316
},
317317
{
318-
<<<<<<< HEAD
319318
"checksumSHA1": "K0fMv1+gkizJUyj5WKgWd2GbDnE=",
320319
"path": "github.com/MustWin/baremetal-sdk-go",
321320
"revision": "fba4ea1cf226a125add96abe10ae1d5ecb09df12",
322321
"revisionTime": "2017-02-18T00:48:24Z"
323-
=======
324-
"checksumSHA1": "JVYlNABd/+8jHz2ZSpGchgaqKWI=",
325-
"path": "github.com/MustWin/baremetal-sdk-go",
326-
"revision": "ac399c960f4e8c42f129d333f4d0deaac55a1043",
327-
"revisionTime": "2017-02-13T19:30:24Z"
328-
>>>>>>> b138c42f8af0008f6e01c2a7333a372a4ade6853
329322
},
330323
{
331324
"checksumSHA1": "Aqy8/FoAIidY/DeQ5oTYSZ4YFVc=",

0 commit comments

Comments
 (0)