aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
blob: 029e9790a34826c16aee6e9e3ef2f87bb7543906 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
From: Florin Dumitrascu <florin.dumitrascu@enea.com>
Date: Thu, 17 Mar 2016 18:15:42 +0100
Subject: [PATCH] arm64 support for OpenDaylight Fuel Plugin

ODL depends on a native library (leveldb).
ODL Beryllium version is still using a native x86 version of
this library (wrapped in leveldbjni). There is no upstream version
of leveldbjni supporting arm64 leveldb, so we need to compile it
when deploying ODL. This is done when running odl-install puppet manifest.
For more info about this ODL limitation, read here:
https://bugs.opendaylight.org/show_bug.cgi?id=3973

[ Alexandru.Avadanii@enea.com ]
Remove JAVA8 changes after upstream rework.

Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 .../modules/opendaylight/files/leveldb-arm64.patch |  35 +++++
 .../opendaylight/files/leveldbjni-native.patch     |  23 ++++
 .../puppet/modules/opendaylight/manifests/init.pp  |   8 ++
 .../modules/opendaylight/manifests/install.pp      |  12 +-
 .../modules/opendaylight/manifests/leveldbjni.pp   | 150 +++++++++++++++++++++
 deployment_tasks.yaml                              |   2 +-
 pre_build_hook                                     |   7 +-
 8 files changed, 233 insertions(+), 8 deletions(-)
 create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
 create mode 100644 deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
 create mode 100644 deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp

diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
new file mode 100644
index 0000000..e0824ca
--- /dev/null
+++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldb-arm64.patch
@@ -0,0 +1,35 @@
+diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
+index e17bf43..78cb6b3 100644
+--- a/port/atomic_pointer.h
++++ b/port/atomic_pointer.h
+@@ -36,6 +36,8 @@
+ #define ARCH_CPU_X86_FAMILY 1
+ #elif defined(__ARMEL__)
+ #define ARCH_CPU_ARM_FAMILY 1
++#elif defined(__aarch64__)
++#define ARCH_CPU_ARM64_FAMILY 1
+ #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
+ #define ARCH_CPU_PPC_FAMILY 1
+ #endif
+@@ -93,6 +95,13 @@ inline void MemoryBarrier() {
+ }
+ #define LEVELDB_HAVE_MEMORY_BARRIER
+
++// ARM64
++#elif defined(ARCH_CPU_ARM64_FAMILY)
++inline void MemoryBarrier() {
++ asm volatile("dmb sy" : : : "memory");
++}
++#define LEVELDB_HAVE_MEMORY_BARRIER
++
+ // PPC
+ #elif defined(ARCH_CPU_PPC_FAMILY) && defined(__GNUC__)
+ inline void MemoryBarrier() {
+@@ -216,6 +225,7 @@ class AtomicPointer {
+ #undef LEVELDB_HAVE_MEMORY_BARRIER
+ #undef ARCH_CPU_X86_FAMILY
+ #undef ARCH_CPU_ARM_FAMILY
++#undef ARCH_CPU_ARM64_FAMILY
+ #undef ARCH_CPU_PPC_FAMILY
+
+ }  // namespace port
diff --git a/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
new file mode 100644
index 0000000..08a528b
--- /dev/null
+++ b/deployment_scripts/puppet/modules/opendaylight/files/leveldbjni-native.patch
@@ -0,0 +1,23 @@
+diff --git a/leveldbjni-all/pom.xml b/leveldbjni-all/pom.xml
+index 426f2a6..c4a2a16 100755
+--- a/leveldbjni-all/pom.xml
++++ b/leveldbjni-all/pom.xml
+@@ -41,7 +41,7 @@
+
+   <groupId>org.fusesource.leveldbjni</groupId>
+   <artifactId>leveldbjni-all</artifactId>
+-  <version>1.8</version>
++  <version>1.8-odl</version>
+   <packaging>bundle</packaging>
+
+   <name>${project.artifactId}</name>
+@@ -119,7 +119,8 @@
+               META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86,
+               META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86-64,
+               META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86,
+-              META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64
++              META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64,
++              META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=aarch64
+             </Bundle-NativeCode>
+          </instructions>
+         </configuration>
diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
index 69cc23a..791ceba 100644
--- a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
@@ -9,4 +9,12 @@ class opendaylight {
   $odl_mgmt_ips = values($odl_mgmt_ips_hash)
   $odl_nodes_names = keys($odl_mgmt_ips_hash)
   $node_internal_address = $odl_mgmt_ips_hash["node-${node_uid}"]
+
+  $arch = $::architecture ? {
+    'aarch64' => $::osfamily ? {
+      'Debian' => 'arm64',
+      default  => 'aarch64',
+    },
+    default => $::architecture,
+  }
 }
diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
index b229757..0979d86 100644
--- a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
@@ -18,6 +18,12 @@ class opendaylight::install (
     ensure  => installed,
   }
 
+  if ($::osfamily == 'Debian' and $::opendaylight::arch == 'arm64') {
+    class { 'opendaylight::leveldbjni':
+      require => Package['opendaylight'],
+    }
+  }
+
   package {'opnfv-quagga':
     ensure => installed,
   }
@@ -35,7 +41,8 @@ class opendaylight::install (
 
   debug("Set odl rest api port to ${rest_port}")
 
-  file { "${conf_dir}/jetty.xml":
+  file { 'jetty.xml':
+    path    => "${conf_dir}/jetty.xml",
     ensure  => file,
     owner   => 'odl',
     content => template('opendaylight/jetty.xml.erb')
@@ -71,6 +78,7 @@ class opendaylight::install (
   Package[$odl_package] ->
   Ini_setting <||> ->
   Firewall <||> ->
-  File <||> ->
+  File['jetty.xml'] ->
+  Class['opendaylight::leveldbjni'] ->
   Service['opendaylight']
 }
diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
new file mode 100644
index 0000000..c599370
--- /dev/null
+++ b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
@@ -0,0 +1,150 @@
+# == Class opendaylight::leveldbjni
+#
+# Manages compilation of JNI for leveldb.
+#
+# It compiles the leveldbjni from sources and patches it so that it's properly
+# detected by maven on arm64 system.
+#
+class opendaylight::leveldbjni(
+  $target = '/opt/opendaylight',
+  $user    = 'odl',
+  $branch  = 'leveldbjni-1.8',
+) {
+  case $::osfamily {
+    'Debian', 'Ubuntu': {}
+    default: {
+      fail('Not supported on OS other than Debian based.')
+    }
+  }
+
+  $libsnappy_dir = '/usr/lib'
+  $leveldb_dir = "${target}/leveldb"
+  $leveldbjni_dir = "${target}/leveldbjni"
+  $environment = ["SNAPPY_HOME=${libsnappy_dir}", "LEVELDB_HOME=${leveldb_dir}", "LEVELDBJNI_HOME=${leveldbjni_dir}", "LIBRARY_PATH=${libsnappy_dir}", "C_INCLUDE_PATH=${libsnappy_dir}", "CPLUS_INCLUDE_PATH=${libsnappy_dir}","JAVA_HOME=/usr/lib/jvm/java-8-openjdk-${::opendaylight::arch}"]
+  $parallel_jobs = ($processorcount + 1)/2
+
+  if ! defined(Package['git']) {
+    package { 'git':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['build-essential']) {
+    package { 'build-essential':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['automake']) {
+    package { 'automake':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['make']) {
+    package { 'make':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['libsnappy-dev']) {
+    package { 'libsnappy-dev':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['patch']) {
+    package { 'patch':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['maven']) {
+    package { 'maven':
+      ensure => 'present',
+    }
+  }
+  if ! defined(Package['openjdk-8-jdk']) {
+    package { 'openjdk-8-jdk':
+      ensure => 'present',
+    }
+  }
+
+  exec { 'leveldb-fetch':
+    path    => ['/usr/bin'],
+    command => "git clone git://github.com/chirino/leveldb.git ${leveldb_dir}",
+    creates => "${leveldb_dir}/.git",
+    user    => $user,
+    require => [Package['git']],
+  } ->
+  exec { 'leveldbjni-fetch':
+    path    => ['/usr/bin'],
+    command => "git clone https://github.com/fusesource/leveldbjni.git -b ${branch} ${leveldbjni_dir}",
+    creates => "${leveldbjni_dir}/.git",
+    user    => $user,
+    require => [Package['git']],
+  } ->
+  exec { 'leveldb-merge-google':
+    path    => ['/usr/bin', '/bin'],
+    command => "git config user.name odl && git config user.email 'o@d.l' && git remote add google https://github.com/google/leveldb.git && git fetch google master && git fetch --tags google && git merge --no-edit v1.18",
+    unless  => "git remote | grep google",
+    cwd     => $leveldb_dir,
+    user    => $user,
+    require => [Package['git']],
+  } ->
+  exec { 'leveldb-patch':
+    path    => ['/usr/bin'],
+    command => "patch -p1 < ${leveldbjni_dir}/leveldb.patch",
+    unless  => "patch -p1 -R -N --dry-run < ${leveldbjni_dir}/leveldb.patch",
+    cwd     => $leveldb_dir,
+    user    => $user,
+    require => [Package['patch']],
+  } ->
+  file { "${leveldb_dir}/leveldb-arm64.patch":
+    ensure => "file",
+    source => "puppet:///modules/opendaylight/leveldb-arm64.patch",
+    owner  => $user,
+  } ->
+  exec { 'leveldb-patch-for-arm64':
+    path    => ['/usr/bin'],
+    command => "patch -p1 < ${leveldb_dir}/leveldb-arm64.patch",
+    unless  => "patch -p1 -R -N --dry-run < ${leveldb_dir}/leveldb-arm64.patch",
+    cwd     => $leveldb_dir,
+    user    => $user,
+    require => [Package['patch']],
+  } ->
+  exec { 'leveldb-build':
+    command => "/usr/bin/make libleveldb.a -j${parallel_jobs}",
+    creates => "${leveldb_dir}/libleveldb.a",
+    environment => $environment,
+    cwd     => $leveldb_dir,
+    user    => $user,
+    require => [Package['git'], Package['make'], Package['build-essential']],
+  } ->
+  file { "${leveldbjni_dir}/leveldbjni.patch":
+    ensure => "file",
+    source => "puppet:///modules/opendaylight/leveldbjni-native.patch",
+    owner  => $user,
+  } ->
+  exec { 'leveldbjni-patch':
+    path    => ['/usr/bin'],
+    command => "patch -p1 < ${leveldbjni_dir}/leveldbjni.patch",
+    unless  => "patch -p1 -R -N --dry-run < ${leveldbjni_dir}/leveldbjni.patch",
+    cwd     => $leveldbjni_dir,
+    user    => $user,
+    require => [Package['patch']],
+  } ->
+  exec { 'leveldbjni-build':
+    command     => "/usr/bin/mvn clean install -P download -P linux64 -P all",
+    # Creates requires a fully qualified path which we don't have
+    unless      => "/usr/bin/test -d ~${user}/.m2/repository/org/fusesource/leveldbjni/leveldbjni-all",
+    environment => $environment,
+    cwd         => $leveldbjni_dir,
+    user        => $user,
+    timeout     => 1200,
+    require     => [Package['maven']],
+  } ->
+  # Can't do this with 'file' type because we need to purge existing package
+  # and at the same time don't perform the copy if we've already copied our
+  # package.
+  exec { 'leveldbjni-copy':
+    path    => ['/bin'],
+    command => "rm -rf ${target}/system/org/fusesource/leveldbjni && cp -r ~${user}/.m2/repository/org/fusesource/leveldbjni $target/system/org/fusesource/",
+    creates => "${target}/system/org/fusesource/leveldbjni/leveldbjni-linux64",
+    user    => $user,
+  }
+}
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index 3706678..841bfee 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -17,7 +17,7 @@
   parameters:
     puppet_manifest: puppet/manifests/odl-install.pp
     puppet_modules: puppet/modules:/etc/puppet/modules
-    timeout: 720
+    timeout: 3600
 - id: netconfig
   type: puppet
   version: 2.0.0
diff --git a/pre_build_hook b/pre_build_hook
index c37da5d..6f4a917 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -192,6 +192,7 @@ function build_pkg {
       fpm --architecture all --force -s python -t deb -m 'mskalski@mirantis.com' --python-install-lib /usr/lib/python2.7/dist-packages ${TMP_DIR}/networking_odl/setup.py
       popd
-      add_opnfv_quagga "${DIR}/repositories/${1}/"
+      # We are adding arm64 opnfv quagga in our local repository
+      #add_opnfv_quagga "${DIR}/repositories/${1}/"
       ;;
     *) echo "Not supported system"; exit 1;;
   esac