trema 0.7.1 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/bin/trema +8 -0
  4. data/features/trema_start/start.feature +1 -1
  5. data/lib/trema/controller.rb +2 -3
  6. data/lib/trema/switch.rb +2 -2
  7. data/lib/trema/version.rb +1 -1
  8. data/trema.gemspec +6 -6
  9. metadata +63 -63
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f4e3a0105d15d386c9a09fa40135e41ef6c0c67a
4
- data.tar.gz: da3456d199beb7b8c562414d8834f8c04956d081
3
+ metadata.gz: a783b90ccae19d3548de557cf844db85f6b72216
4
+ data.tar.gz: a78c6997062acd0bf6c0ecdeb8acfe59041a6b00
5
5
  SHA512:
6
- metadata.gz: 89765e3f3ca90ef87fdd77c5affd94ab7eccc3f99962c75ce43371215f05446c95936b3a69356dbe1ce48b5464d275e58fe56f29c22f26b3c167a52ed03b1454
7
- data.tar.gz: 54e203d8abcb88b771dfb3300f988e0ed3e2b6f95176bfd1ba396d43ccfad5a56a789ad467d4c9fc1326af9691d29bcd4da3c8f8ea535f7b7aa296eabcd1119c
6
+ metadata.gz: 171ed60547f4a6ef0424221d60eeda4449b3e1edac92c207f59c24d8b219da30cf048c021731902bc97aa4d4d8e859a5878a94847e6a49fa6641cff97d17e831
7
+ data.tar.gz: 7ab63d8ec0fecc4942f001d7d204d2405d976b450ff3c83708c8ff301c72d9744841ab3a514d54339042bab21aa6e6222286b81ec7c77938bc70e9d3dd182cff
data/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
3
3
  ## develop (unreleased)
4
4
 
5
5
 
6
+ ## 0.8.0 (10/30/2015)
7
+ ### New features
8
+ * [#409](https://github.com/trema/trema/pull/409): Support rubies installed using apt.
9
+ * [#414](https://github.com/trema/trema/pull/414): Add netns command.
10
+
11
+
6
12
  ## 0.7.1 (9/28/2015)
7
13
  ### Changes
8
14
  * Pio 0.27.1 (fixes [trema/pio#238](https://github.com/trema/pio/issues/238))
data/bin/trema CHANGED
@@ -233,6 +233,14 @@ module Trema
233
233
  end
234
234
  end
235
235
 
236
+ desc 'Opens a new shell in the specified network namespace'
237
+ arg_name 'name'
238
+ command :netns do |c|
239
+ c.action do |global_options, options, args|
240
+ system "sudo ip netns exec #{args[0]} #{ENV['SHELL']}"
241
+ end
242
+ end
243
+
236
244
  default_command :help
237
245
 
238
246
  on_error do |e|
data/features/trema_start/start.feature CHANGED
@@ -62,7 +62,7 @@ Feature: start
62
62
  error: vhost "host1" is already running!
63
63
  """
64
64
 
65
- @sudo @announce-output
65
+ @sudo
66
66
  Scenario: start NO_SUCH_NAME
67
67
  When I run `trema start NO_SUCH_NAME`
68
68
  Then the exit status should not be 0
data/lib/trema/controller.rb CHANGED
@@ -54,8 +54,7 @@ module Trema
54
54
  match: @user_options.fetch(:match),
55
55
  table_id: @user_options[:table_id] || 0,
56
56
  flags: @user_options[:flags] || [],
57
- instructions: @user_options[:instructions] || [],
58
- actions: @user_options[:actions] || []
57
+ instructions: @user_options[:instructions] || []
59
58
  }
60
59
  end
61
60
  # rubocop:enable MethodLength
@@ -228,7 +227,7 @@ module Trema
228
227
  # The default handler for echo request messages.
229
228
  # Override this to implement a custom handler.
230
229
  def echo_request(datapath_id, message)
231
- echo_reply = Echo::Reply.new(xid: message.xid)
230
+ echo_reply = Echo::Reply.new(transaction_id: message.xid)
232
231
  send_message datapath_id, echo_reply
233
232
  end
234
233
 
data/lib/trema/switch.rb CHANGED
@@ -77,8 +77,8 @@ module Trema
77
77
  def read_openflow_binary
78
78
  header_binary = drain(OPENFLOW_HEADER_LENGTH)
79
79
  header = OpenFlowHeaderParser.read(header_binary)
80
- body_binary = drain(header.length - OPENFLOW_HEADER_LENGTH)
81
- fail if (header_binary + body_binary).length != header.length
80
+ body_binary = drain(header.message_length - OPENFLOW_HEADER_LENGTH)
81
+ fail if (header_binary + body_binary).length != header.message_length
82
82
  header_binary + body_binary
83
83
  end
84
84
 
data/lib/trema/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # Base module.
2
2
  module Trema
3
3
  # gem version.
4
- VERSION = '0.7.1'.freeze
4
+ VERSION = '0.8.0'.freeze
5
5
  end
data/trema.gemspec CHANGED
@@ -23,9 +23,8 @@ Gem::Specification.new do |gem|
23
23
 
24
24
  gem.add_dependency 'bundler', '~> 1.10.6'
25
25
  gem.add_dependency 'gli', '~> 2.13.2'
26
- gem.add_dependency 'phut', '~> 0.6.10'
27
- gem.add_dependency 'pio', '~> 0.27.1'
28
- gem.add_dependency 'rake'
26
+ gem.add_dependency 'phut', '~> 0.7.0'
27
+ gem.add_dependency 'pio', '~> 0.27.2'
29
28
 
30
29
  # Docs
31
30
  gem.add_development_dependency 'relish', '~> 0.7.1'
@@ -34,9 +33,10 @@ Gem::Specification.new do |gem|
34
33
  # Test
35
34
  gem.add_development_dependency 'aruba', '~> 0.9.0'
36
35
  gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
37
- gem.add_development_dependency 'coveralls', '~> 0.8.2'
38
- gem.add_development_dependency 'cucumber', '~> 2.0.2'
39
- gem.add_development_dependency 'reek', '~> 3.4.1'
36
+ gem.add_development_dependency 'coveralls', '~> 0.8.3'
37
+ gem.add_development_dependency 'cucumber', '~> 2.1.0'
38
+ gem.add_development_dependency 'rake'
39
+ gem.add_development_dependency 'reek', '~> 3.5.0'
40
40
  gem.add_development_dependency 'rspec', '~> 3.3.0'
41
41
  gem.add_development_dependency 'rspec-given', '~> 3.7.1'
42
42
  gem.add_development_dependency 'rubocop', '~> 0.34.2'
metadata CHANGED
@@ -1,223 +1,223 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trema
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yasuhito Takamiya
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-28 00:00:00.000000000 Z
11
+ date: 2015-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 1.10.6
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.10.6
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: gli
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 2.13.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 2.13.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: phut
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.6.10
47
+ version: 0.7.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.6.10
54
+ version: 0.7.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: pio
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.27.1
61
+ version: 0.27.2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.27.1
69
- - !ruby/object:Gem::Dependency
70
- name: rake
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - '>='
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - '>='
81
- - !ruby/object:Gem::Version
82
- version: '0'
68
+ version: 0.27.2
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: relish
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
- - - ~>
73
+ - - "~>"
88
74
  - !ruby/object:Gem::Version
89
75
  version: 0.7.1
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
- - - ~>
80
+ - - "~>"
95
81
  - !ruby/object:Gem::Version
96
82
  version: 0.7.1
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: yard
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
- - - ~>
87
+ - - "~>"
102
88
  - !ruby/object:Gem::Version
103
89
  version: 0.8.7.6
104
90
  type: :development
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
- - - ~>
94
+ - - "~>"
109
95
  - !ruby/object:Gem::Version
110
96
  version: 0.8.7.6
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: aruba
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
- - - ~>
101
+ - - "~>"
116
102
  - !ruby/object:Gem::Version
117
103
  version: 0.9.0
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
107
  requirements:
122
- - - ~>
108
+ - - "~>"
123
109
  - !ruby/object:Gem::Version
124
110
  version: 0.9.0
125
111
  - !ruby/object:Gem::Dependency
126
112
  name: codeclimate-test-reporter
127
113
  requirement: !ruby/object:Gem::Requirement
128
114
  requirements:
129
- - - ~>
115
+ - - "~>"
130
116
  - !ruby/object:Gem::Version
131
117
  version: 0.4.8
132
118
  type: :development
133
119
  prerelease: false
134
120
  version_requirements: !ruby/object:Gem::Requirement
135
121
  requirements:
136
- - - ~>
122
+ - - "~>"
137
123
  - !ruby/object:Gem::Version
138
124
  version: 0.4.8
139
125
  - !ruby/object:Gem::Dependency
140
126
  name: coveralls
141
127
  requirement: !ruby/object:Gem::Requirement
142
128
  requirements:
143
- - - ~>
129
+ - - "~>"
144
130
  - !ruby/object:Gem::Version
145
- version: 0.8.2
131
+ version: 0.8.3
146
132
  type: :development
147
133
  prerelease: false
148
134
  version_requirements: !ruby/object:Gem::Requirement
149
135
  requirements:
150
- - - ~>
136
+ - - "~>"
151
137
  - !ruby/object:Gem::Version
152
- version: 0.8.2
138
+ version: 0.8.3
153
139
  - !ruby/object:Gem::Dependency
154
140
  name: cucumber
155
141
  requirement: !ruby/object:Gem::Requirement
156
142
  requirements:
157
- - - ~>
143
+ - - "~>"
158
144
  - !ruby/object:Gem::Version
159
- version: 2.0.2
145
+ version: 2.1.0
160
146
  type: :development
161
147
  prerelease: false
162
148
  version_requirements: !ruby/object:Gem::Requirement
163
149
  requirements:
164
- - - ~>
150
+ - - "~>"
165
151
  - !ruby/object:Gem::Version
166
- version: 2.0.2
152
+ version: 2.1.0
153
+ - !ruby/object:Gem::Dependency
154
+ name: rake
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ version: '0'
160
+ type: :development
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
166
+ version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: reek
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ~>
171
+ - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 3.4.1
173
+ version: 3.5.0
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ~>
178
+ - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 3.4.1
180
+ version: 3.5.0
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rspec
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ~>
185
+ - - "~>"
186
186
  - !ruby/object:Gem::Version
187
187
  version: 3.3.0
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ~>
192
+ - - "~>"
193
193
  - !ruby/object:Gem::Version
194
194
  version: 3.3.0
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: rspec-given
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ~>
199
+ - - "~>"
200
200
  - !ruby/object:Gem::Version
201
201
  version: 3.7.1
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ~>
206
+ - - "~>"
207
207
  - !ruby/object:Gem::Version
208
208
  version: 3.7.1
209
209
  - !ruby/object:Gem::Dependency
210
210
  name: rubocop
211
211
  requirement: !ruby/object:Gem::Requirement
212
212
  requirements:
213
- - - ~>
213
+ - - "~>"
214
214
  - !ruby/object:Gem::Version
215
215
  version: 0.34.2
216
216
  type: :development
217
217
  prerelease: false
218
218
  version_requirements: !ruby/object:Gem::Requirement
219
219
  requirements:
220
- - - ~>
220
+ - - "~>"
221
221
  - !ruby/object:Gem::Version
222
222
  version: 0.34.2
223
223
  description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
@@ -229,12 +229,12 @@ executables:
229
229
  extensions: []
230
230
  extra_rdoc_files: []
231
231
  files:
232
- - .gitignore
233
- - .hound.yml
234
- - .rspec
235
- - .rubocop.yml
236
- - .ruby-version
237
- - .travis.yml
232
+ - ".gitignore"
233
+ - ".hound.yml"
234
+ - ".rspec"
235
+ - ".rubocop.yml"
236
+ - ".ruby-version"
237
+ - ".travis.yml"
238
238
  - CHANGELOG.md
239
239
  - CONTRIBUTING.md
240
240
  - Gemfile
@@ -333,17 +333,17 @@ require_paths:
333
333
  - lib
334
334
  required_ruby_version: !ruby/object:Gem::Requirement
335
335
  requirements:
336
- - - '>='
336
+ - - ">="
337
337
  - !ruby/object:Gem::Version
338
338
  version: 2.0.0
339
339
  required_rubygems_version: !ruby/object:Gem::Requirement
340
340
  requirements:
341
- - - '>='
341
+ - - ">="
342
342
  - !ruby/object:Gem::Version
343
343
  version: '0'
344
344
  requirements: []
345
345
  rubyforge_project:
346
- rubygems_version: 2.4.7
346
+ rubygems_version: 2.4.6
347
347
  signing_key:
348
348
  specification_version: 4
349
349
  summary: Full-stack OpenFlow framework.