From 8a3508108a9f9a64322fd6d0050b54ab98af3030 Mon Sep 17 00:00:00 2001
From: Tal Gitelman <tg851x@intl.att.com>
Date: Sun, 15 Oct 2017 21:00:26 +0300
Subject: [PATCH] VoltE fix

Change-Id: I803e744554b0351da4a474b3c14e70dadd1274c2
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
---
 .../resources/import/tosca/onap-types/vduCpd/vduCpd.yml |   2 +-
 .../resources/import/tosca/onap-types/vduCpd/vduCpd.zip | Bin 562 -> 567 bytes
 .../sdc-normatives/recipes/import_Normatives.rb         |   3 ++-
 .../sdc-normatives/recipes/upgrade_Normatives.rb        |   3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml
index e1f6d068ce..e5d79fcacf 100644
--- a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml
@@ -50,7 +50,7 @@ node_types:
         - 0
         - UNBOUNDED
     - virtual_link:
-        capability: tosca.capabilities.nfv.VirtualBindable
+        capability: tosca.capabilities.nfv.VirtualLinkable
         occurrences:
         - 0
         - UNBOUNDED
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip
index 6a9d4be124a46dccca5346ecca05ed5aa9247dc7..e1b5be9f2f43ef05642c8b663f815a9e7b7d25c7 100644
GIT binary patch
delta 495
zcmdnQvYkaZz?+#xgn@y9gTZF8zxScdZ7g#q3TxF*xUelMV%@as^R_Iu+9uf_{Pe!@
z&l^kP_!h8o$}2tp`s3>3pARPVgo#OgIU!LKBpWcvH`dpk^Y#meue(ZL_1;?bwwGT_
z<hx){ZLn|PY)5bD`z5pAo7MM(`K3fEyg9I{%_&-ZV!J>EPp62Iz~c<Fb$p$h%T6)x
zXQ>K%A-UorTfNA^{vH<H3b{qkO($HLdiY4U3Hz;GSzEj}yy!H29ugkk&(Ht8J%4`L
z>CT9t^^+=_!u+qT{yFnb)=s_upRLu;{B`;Hlc%!csKxJqf`UeEm6m@W^&5OYJX*NX
z<7n>H%=WO8=Kh?q{u!r!Xjxo1t1~BH%?^(bsviPc-50FxT>7G|-hfZ{TYvGx68<Gi
z`YmQW_;+KD=Kp)YyKI>489m>NE$Ru-YDxHf+v&iKy}L#3i97jB$PLhMvVVOms%grV
z3p4%~${j2GVX*Oyi}d08xmRzeZt{PzRwVVSsnsiCt0({7?A3_qyFEANs`_?2MTyCs
z2c$J#ZLZyF|L*;}{@-{1>=He!u&{n#+r#cVyJtOA5AbGWvS&bxqsdnp_4VvNURZw1
f^)h1=)B3-&tPpg7H!B-3N*Ne|Fa}5;Wd!j6U;ycU

delta 490
zcmdnavWZ1Fz?+#xgn@y9gW>H0Bkvgs@$+X)6xOQWk+Zt>X;$T1PwQ35vp-sd{<EFj
z@B8X0gVu_#ibZk#@wW5$`A%k}E_CegIjDY>QT67Pt0hx5^zwzQk6wOn<=R_uKNB1a
z<rS}nUlrLZxn;{o-|asWKR?fS>N1V>5Z{_CjV+~ul^l)7CwM3_8TO?;el@`&d%4Yr
z;05lj^BSdc9qI-DobkBO^jxtjj@dKT(r1rH@q)Fh-FCBd&x<JbEB*SmqP)EN$G_C=
zb2?PNYRzQN_?ohJ*8G!er@j7UzrXm<9seou=O?tM_iW~8Wf$M!<n-eGf5sau`f^g;
zAu-`|%QB|ce4cXQYs<2p^-auo&m7`B+SSbx&%__PgT2adqsU!>`eO@^{wvm-^R98q
z7eRL6JMpuPpW0XNS2%xw-{I2kRt@DTT#7gT>=Q63lh<qQZxs+uk-jqd!TDX=rYWeJ
znmm&}ci4h&zS^|88OcB1Z?4+w^Nn-w)J1Fdxw+RmwcnY)SDf{9;qHm6e?7UT&XQ~-
zSi$UCyY2k9<A2Y-E!;mletVLI^q2ni=RR-;cr!BDGoVG!<XepTdJMOJ%v@k_nGr@$
bc9TA{0>}^WW@Q7$CIcf7#sKL9j36EW%}w9o

diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
index 8dff57abe8..ba72dab34b 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/import_Normatives.rb
@@ -10,7 +10,8 @@ bash "import-normatives" do
     tar xvfz /tmp/normatives.tar.gz
     cd normatives/scripts/import/tosca/
     /bin/chmod +x importNormativeAll.py
-    python importNormativeAll.py -i localhost --debug=true > /var/lib/jetty/logs/importNormativeAll.log
+# add --debug=true to the importNormativeAll.py arguments to enable debug
+    python importNormativeAll.py -i localhost > /var/lib/jetty/logs/importNormativeAll.log
   EOH
 end
 
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb
index 3baf4732fa..52afe4d7b8 100644
--- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb
+++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-normatives/recipes/upgrade_Normatives.rb
@@ -10,7 +10,8 @@ bash "upgrade-normatives" do
     tar xvfz /tmp/normatives.tar.gz
     cd normatives/scripts/import/tosca/
     /bin/chmod +x upgradeNormative.py importGroupTypes.py
-    python upgradeNormative.py -i localhost --debug=true > /var/lib/jetty/logs/upgradeNormative.log
+# add --debug=true to the importNormativeAll.py arguments to enable debug
+    python upgradeNormative.py -i localhost > /var/lib/jetty/logs/upgradeNormative.log
   EOH
 end
 
-- 
2.16.6