From 3ef175b5f6e74a685cfa998153b4d635f9883dfe Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 22 Sep 2017 23:47:09 +0300 Subject: [PATCH] add new global types add global types needed for volte use case Change-Id: I26f2de45d46628c95fd708b7e61b007c214e2c94 Issue-ID: SDC-192 Signed-off-by: Michael Lando --- .gitignore | 4 + .../tosca/capability-types/capabilityTypes.yml | 45 ++++- .../tosca/capability-types/capabilityTypes.zip | Bin 1402 -> 1598 bytes .../import/tosca/data-types/dataTypes.yml | 208 ++++++++++++++++++++- .../import/tosca/data-types/dataTypes.zip | Bin 5519 -> 6242 bytes .../tosca/heat-types/underlayVpn/underlayVpn.json | 15 ++ .../tosca/heat-types/underlayVpn/underlayVpn.yml | 160 ++++++++++++++++ .../tosca/heat-types/underlayVpn/underlayVpn.zip | Bin 0 -> 1164 bytes .../onap-types/extImageFile/extImageFile.json | 15 ++ .../tosca/onap-types/extImageFile/extImageFile.yml | 25 +++ .../tosca/onap-types/extImageFile/extImageFile.zip | Bin 0 -> 377 bytes .../extLocalStorage/extLocalStorage.json | 15 ++ .../onap-types/extLocalStorage/extLocalStorage.yml | 14 ++ .../onap-types/extLocalStorage/extLocalStorage.zip | Bin 0 -> 350 bytes .../import/tosca/onap-types/extZteCP/extZteCP.json | 15 ++ .../import/tosca/onap-types/extZteCP/extZteCP.yml | 76 ++++++++ .../import/tosca/onap-types/extZteCP/extZteCP.zip | Bin 0 -> 583 bytes .../tosca/onap-types/extZteVDU/extZteVDU.json | 15 ++ .../tosca/onap-types/extZteVDU/extZteVDU.yml | 66 +++++++ .../tosca/onap-types/extZteVDU/extZteVDU.zip | Bin 0 -> 658 bytes .../import/tosca/onap-types/extZteVL/extZteVL.json | 15 ++ .../import/tosca/onap-types/extZteVL/extZteVL.yml | 69 +++++++ .../import/tosca/onap-types/extZteVL/extZteVL.zip | Bin 0 -> 529 bytes .../tosca/onap-types/vduCompute/vduCompute.json | 15 ++ .../tosca/onap-types/vduCompute/vduCompute.yml | 96 ++++++++++ .../tosca/onap-types/vduCompute/vduCompute.zip | Bin 0 -> 667 bytes .../import/tosca/onap-types/vduCpd/vduCpd.json | 15 ++ .../import/tosca/onap-types/vduCpd/vduCpd.yml | 56 ++++++ .../import/tosca/onap-types/vduCpd/vduCpd.zip | Bin 0 -> 562 bytes .../vduVirtualStorage/vduVirtualStorage.json | 15 ++ .../vduVirtualStorage/vduVirtualStorage.yml | 27 +++ .../vduVirtualStorage/vduVirtualStorage.zip | Bin 0 -> 421 bytes .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.json | 15 ++ .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml | 26 +++ .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip | Bin 0 -> 478 bytes .../scripts/import/tosca/importHeatTypes.py | 3 +- .../scripts/import/tosca/importNormativeAll.py | 5 + .../scripts/import/tosca/importOnapTypes.py | 101 ++++++++++ .../import/tosca/upgradeNormativeVersionAll.py | 4 + sdc-os-chef/pom.xml | 2 +- utils/webseal-simulator/sdc-simulator/Dockerfile | 21 +-- 41 files changed, 1132 insertions(+), 26 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extLocalStorage/extLocalStorage.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCompute/vduCompute.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.zip create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml create mode 100644 catalog-be/src/main/resources/import/tosca/onap-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip create mode 100644 catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py diff --git a/.gitignore b/.gitignore index 631577ffa1..847f80b91f 100644 --- a/.gitignore +++ b/.gitignore @@ -161,3 +161,7 @@ common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-cor /utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml index c94909101b..45c2b812cf 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml @@ -117,8 +117,6 @@ tosca.capabilities.Scalable: type: integer tosca.capabilities.network.Bindable: derived_from: tosca.capabilities.Node - - tosca.capabilities.Container.Docker: derived_from: tosca.capabilities.Container properties: @@ -204,3 +202,46 @@ org.openecomp.capabilities.metric.SnmpTrap: description: Object Id of the metric required: true status: SUPPORTED +#ONAP types +tosca.capabilities.nfv.VirtualStorage: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.VirtualCompute: + derived_from: tosca.capabilities.Root + properties: + requested_additional_capabilities: + type: map + entry_schema: + type: tosca.datatypes.nfv.RequestedAdditionalCapability + required: false + virtual_memory: + type: tosca.datatypes.nfv.VirtualMemory + required: true + virtual_cpu: + type: tosca.datatypes.nfv.VirtualCpu + required: true +tosca.capabilities.nfv.VirtualBindable: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.VirtualLinkable: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.Forwarder: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.ext.GuestOs: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.ext.ImageFile: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.ext.LocalAttachment: + derived_from: tosca.capabilities.Root +tosca.capabilities.nfv.ext.Compute.Container.Architecture: + derived_from: tosca.capabilities.Root + properties: + num_cpus: + type: string + required: false + flavor_extra_specs: + type: map + required: false + entry_schema: + type: string + mem_size: + type: string + required: false \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip index 1742545f14075e061bc5c07750f63b3fe523055a..268287a39d49e8025aad7611b608b32ddbc76953 100644 GIT binary patch delta 1591 zcmV-72FUsP3cd_~P)h>@6aWAK2mnQ}GfNdM^JkI;008P6000vJ003iQaA9I;Y-x0P zRC#b^b1r#pY|UBSZ__Xkf9J2T#0y9xVy}HbDlH$AfK_Y93qq0WTw6284z|;+{Pmpe zq*=bY1O{3ks>Zqd-TA)lT4flG7|rOK3vM}>=t?O&AT)@o z5{>W4tmHV5)gc2yg&@lAKo>-7YM@DE5K;3zkd0R9vku8qYbo2MAngRj2jV1l)DzO9 zXcx>EmB3#C%#^g0OVGnn2+6d{K)V&>!jH_;m}R+frt}|+CYTT|Eo?y-YZ`v$TthM; z8!8MGt4v9MV>LxmhgE!Dk*x-5LB~qR$VSD4ocp&Z1+~K^knAw2Nke4?)vt2NZFD4g z9NDj3nli7cds8wGWq=06Qq#-XQ>_TeEZ0zf=UOWzfXb$riYeD3&Zyl@NRM`H zVMhgHNmCfhD8b$;eG_;Gvy$cx7FQQvr>l2<)~v9%{)n%5e1NxWw`GNRiy=OE*KUwLIUh%J#cl?U$w#KT9s4~h zFhY9V*=~Kc00_0#>|!jfBZr-qtQuZ_Xyt7!+xk?^w;$G3Ic4CnQTIyZDGUV+*)}|F z%0T+W<;~zg^68`WHbS>cU@FZT2S03q7CYJ%_&I6>XqSeYee@Zu9y?O>>o*3jlHNQ) zPl?2Q^8N_joJ%HhB=Idg@Q@?cp*cfvi!Y@c7*d7PtU@59vSk=>^|+ZTgICu<^sFx9)Hh4Sb9c2(0mI>ln}5i8gD1(&#lsjp~}t*`ntkxRb9y9aDV1c z;%CJ?h(8R*3B9NBXxlc<4c=6LgH3&vOUu)H0qfa&#huE)u<>XHTqykA)pH)q-+!Nw zc)oD+Iy-9Fk)dv49&EvCzlG~PM>%wtf+O-`wJTOx#lcO`=jFIKeb@_2nPv+m1Y$pB zHyBitWI@j^M<|{Q^~2@*2TsQ1BB>|hzcB1d)9lGx)uNJ5!KBYGzf2c@UXJD`_VIIX z58ivFZ>dIz3He(nxUIP$s z;eqtA_ZSmDVA7if8e*;iU0Rle&6aWAK z2mnQ}GfNdM^JkI;008P6000vJBme*a00000AOHXW00000V_|TUFa;bg{=~q_c`?%g p08@6aWAK2mteXM@ryKath7_0055{000w{?gbWq)mTf9(=ZUe zBk>{JT<{Qtr zRvAVUMhm*+f?EzIxmC)J$^CnTWMG))h2=_)$zlU!aWkJ>5sd<5QmO37Vpjm6LJ(y) zpi7}8HP93?Xi@Vmkd;<{`TctxzOSsMY?FhuV+2r&XQ`JTlOtF=4ZT$v{G^GAl9qA_ zdWaoD3atvze#z_MN4h*^g)I7?Y>*HM&BOxCWB##&wqnT2TGiNp6$9%r66f@FaOkUcUMkg)(mL zQp3NY*W(!c`(Njtym=laa>)ON>kd-9kXfPlFgCX+6c(&vN;J}m=(t?RHE(`Jov>(` z6{VWewxKe^r75gV?%V)#8XAgAr36sfa8}cETBHTFn=v^Gv+eSLG?g@m3v?yeFG}A< z^#R(XwU^oL_4})T#f!MkB_@ShrTYclD5u$3>TIdtS&IK1=9YXYwMN8Jy#_lX1>gbt z@emW!aGulRLel13rUK;Jr{`()0?%2!OAXsVPJ?ulD)R!EU#Av#y>xcZNM58g%QP6% z8J^B!m{Lo9TNqXpmGsH_N@i{;I2&rQqtqUd$%e``5bR}tRd#C>LyN?j_ih976Vm!ZS>k_B{w4vGtMYR9z9a)-Bu3E1Q4@PPGn>m zny~V+S?I8YB8L>V<<;IDxt^7Fs77&P6yrhu3%46@yMmkyu6}~4r`ESQ_*!5Jd=sal zYzETQ%CkLxS*Y+#1*t-;Va*MmvJu(z?R?0=;FnIJI?bi442xwrmG;c37R!UQ%AnGI zUsgMa+2Phyfy5L=;B87C&f}nZ5_wf&Jtv<%&Q7B@2qJK1zQa7^{Y)P1U{tdWx4^8^ zmmJb4IY@0kgM?$tQ){^P7PM(8R;%5b-RYV8v12KJdS>NV2*U}^CDK{4xYnK}TlM+0 zRHa`pRV}}tSMS(Lb(TEG3g{mIKf2$)hkqxB@?@&mUEkS!uhj_bsYDAT&(SQm+h?5_ z@rX8?6i?*ggH+35-DWiyw9&R<9oqOQ)BbQ&27ZU-tr9MW{zhYA4k@pSWv{us>(8=S zW=gMr6J&z~rt+e36~$g^u{GX87}5rr?LxWQCU3y%;X}%CjDrjw0JN_5S43jXh1A61 zfJ-JEiiC+EDv`ahU2`Pi7GFv~f8+{>W`+4mIt$HTyiT0M4OH(?8XIH4kVg!DaBkH| zY>drzKYury-P|r-O!39R^4U&MLohvjsR22E!uaDDdN#58RD=Ru+aHk?P7)Yz_)7Ca z;P;8koxoPT#pfvqOGo4-b!$MOjDTgyMG^A}UMs!pk9bmQ)KRzbdLH9dVibNO7?l$z zJ{Y79{Q>qRQEpyTLd*t4{nkm#^B^1)vOHq|k_m93@VT>FovrRaP_1~M@pl7% zw#V6BzGpAkHJFE8mqZ9E)qGz$Psqc?rd(wQ4Q?W)M}w(*J{@zJ7c(UUn*X=+VGt-O zBGT@RD4z9C$j$N-&fnxZtJmjmits|y;y(zlMVS9kY`+6gO928u02BZK00;o{dPhp& zOmYg&1ONb!7XSbg03-ka0000003ZO9>jfn)V=l{MMS;=*V=l{MMS;=*%!YE{ijL6% ZP)h{{000000RRC2WdHyG{{#R4003cygs=br diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml index ba7a7a0cfd..43debe6291 100644 --- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml @@ -849,7 +849,7 @@ org.openecomp.datatypes.Root: properties: supplemental_data: type: map - required: false + required: true entry_schema: description: > A placeholder for missing properties that would be included in future ecomp model versions. @@ -1240,9 +1240,6 @@ org.openecomp.datatypes.flavors.DeploymentFlavor: license_flavor: type: org.openecomp.datatypes.flavors.LicenseFlavor required: false - - - org.openecomp.datatypes.ImageInfo: derived_from: tosca.datatypes.Root properties: @@ -1257,3 +1254,206 @@ org.openecomp.datatypes.ImageInfo: type: string required: false default: md5 +#onap +tosca.datatypes.nfv.VnfcConfigurableProperties: + derived_from: tosca.datatypes.Root + properties: + additional_vnfc_configurable_properties: + type: map + entry_schema: + type: string + required: false +tosca.datatypes.nfv.RequestedAdditionalCapability: + derived_from: tosca.datatypes.Root + properties: + #name: + # key of containing map + support_mandatory: + type: boolean + required: true + min_requested_additional_capability_version: + type: string + required: false + preferred_requested_additional_capability_version: + type: string + required: false + requested_additional_capability_name: + type: string + required: true + target_performance_parameters: + type: map + entry_schema: + type: string + required: true +tosca.datatypes.nfv.VirtualMemory: + derived_from: tosca.datatypes.Root + properties: + # Number + virtual_mem_size: + type: scalar-unit.size + required: true + virtual_mem_oversubscription_policy: + type: string + required: false + numa_enabled: + type: boolean + required: false +tosca.datatypes.nfv.VirtualCpuPinning: + derived_from: tosca.datatypes.Root + properties: + cpu_pinning_policy: + type: string # CpuPinningPolicy + constraints: + - valid_values: [ static, dynamic ] + required: false + cpu_pinning_map: + type: map + entry_schema: + type: string + required: false +tosca.datatypes.nfv.VirtualCpu: + derived_from: tosca.datatypes.Root + properties: + cpu_architecture: + type: string + required: false + num_virtual_cpu: + type: integer + required: true + virtual_cpu_clock: + type: scalar-unit.frequency + required: false + virtual_cpu_oversubscription_policy: + type: string + required: false + virtual_cpu_pinning: + type: tosca.datatypes.nfv.VirtualCpuPinning + required: false +tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: + derived_from: tosca.datatypes.Root + properties: + name: + type: string + required: false + description: + type: string + required: false + support_mandatory: + type: boolean + required: true + requirement: + type: string # not specified + required: true +tosca.datatypes.nfv.L2AddressData: + derived_from: tosca.datatypes.Root + properties: + address: + type: string + required: false +tosca.datatypes.nfv.L3AddressData: + derived_from: tosca.datatypes.Root + properties: + ip_address_assignment: + type: boolean + required: true + floating_ip_activated: + type: boolean + required: true + ip_address_type: + type: string + required: false + constraints: + - valid_values: [ipv4, ipv6] + number_of_ip_address: + type: integer + required: false +tosca.datatype.nfv.AddressData: + properties: + address_type: + constraints: + - valid_values: + - mac_address + - ip_address + type: string + l2_address_data: + required: false + type: tosca.datatypes.nfv.L2AddressData + l3_address_data: + required: false + type: tosca.datatypes.nfv.L3AddressData +tosca.datatypes.nfv.ConnectivityType: + derived_from: tosca.datatypes.Root + properties: + layer_protocol: + type: string + required: true + constraints: + - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ] + flow_pattern: + type: string + required: false +tosca.datatypes.nfv.VlFlavour: + derived_from: tosca.datatypes.Root + properties: + flavourId: + type: string +tosca.datatypes.nfv.ext.AddressPairs: + properties: + ip: + type: string + required: false + mac: + type: string + required: false +tosca.datatypes.nfv.ext.FloatingIP: + properties: + external_network: + type: string + required: false + ip_address: + type: string + required: false +tosca.datatypes.nfv.ext.LocationInfo: + properties: + availability_zone: + type: string + required: false + vimid: + type: integer + required: false + tenant: + type: string + required: false +tosca.datatypes.nfv.ext.HostRouteInfo: + properties: + destination: + type: string + required: false + nexthop: + type: string + required: false + +tosca.datatypes.nfv.ext.InjectData: + properties: + file_name: + type: string + required: false + file_data: + type: string + required: false +tosca.datatypes.nfv.ext.zte.WatchDog: + properties: + enable_delay: + type: integer + required: false + action: + type: string + required: false +tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: + properties: + scope: + type: string + required: false + affinity_antiaffinity: + type: string + required: false \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip index c97ea2caa033c8f8c63a7a489e9dab2c04d9ba04..506a58f4b1d8c689398c5c4cfa00bdef7fb120b7 100644 GIT binary patch literal 6242 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 M0002(7XSbN02@B>4gdfE literal 5519 zcmV;A6>#cMO9KQH000080IPa3OKJFHT<;VB0BD&201W^D0AyiwVN`i=WpgfhZEW2g zYj5N<@H^7|2dhZHNp}l(9Q{xM($a!hiI(Mh93KEhY2w{Amlt_#TOR+N8NZTjl8x=8 z$3Z`|&BNn)dpsUHWm*LOBJ@kYyw7N{c$uc<*`xOe3271JEGt=>oRL>MN?v_`eZC|) zJSP|MI(Y@}6F-VbTJC5rAK&-|tsfTvC1-m|HhCI9dhgMDEGg-h=GcLJ6ngmVjP&7w zEs8Q{$=0I5O`1m3Pb^w&qSP-f-j7&e^Lp%O7H|Jnq&B$2-N?_MRtd8~snKdtus>)| z)B2T8i;~5bEjBs*y`o8QKi-UxNADe?eV)^hCMENuGh#|4Az7YgG%pz~L@R!$OoLQF z;Xl~oj0hc5_YhYGJ)V(`9~G3}hECql#KYH*HAd7neifBxB=d{nHqFCE^J6XF(EH-7 z{TTFS7$yD#Jjw69BG}Q`=Z%M;R|VLd70q2CyaK7OzaFU6K-7f{5NMuEgI}vPq4NsE05K&P)9Gh?dmvvGCYiei-JoDCnVD zp!cy-fML4VXU1f;0h0KHSmh zK85FA?k8L5w@N;bCJ^Lu0%#bYv%E-J0^fSx&^C0Y)n z<%-p#_ulXRB=oi!Yki;Gq<$WPAjt|9F!wQddw=i;p{DtE0a}vKAdRyIaXadln!=^9 zrM1t@Be#P9@^X3p@oKHCl4Jm?IMC6qc@OJo7rFvHGGrEjWd$mE{o{K5{mWNhUx)`R zv+s1ZcJI@W@kMn5|1Q2wi}Gb!mDH8{2!P}W0TgVLl1-YE5<+?bzef(deaRB8LFO!h zX+pCh_QR=Xf#}_yQDR)UD|cyThXytx&`QwS#>)*2LJXz0jG{E)9j#$5;wm#BLWD}h zPeP1(>LE?j_u z4k%bk^8)-bAcKOd2T_uS7rX&--T-BONdkCsLorYfIk_-H9Yk^}=0nXvuQM z-mi|d1fqEyLfD2}e0#notdPJ$G!5Q)>tVgWVJAwxIPYDW^lXh8ZYf}@)%8hR7~TFqxg()4kuW^b3+;{SG+-&i^VQDqf_lj|4BTKrOGM}5>RKR(poH>?LB-q`{#>*8*EzI} z-w=;>5QKU>3^b+@IlcuGz4h-Wh1&+`8fnsDJgz4X$nC>OS*HQ!BTb9x#VE0szVgEt zAGR(}#U-kfh3{7u(zXpZc|pvyVRsR=Vd|Q~CJH+5^PC=-- zm*yV8!%XQX;$gtT+>VjwtBaRz$Vt8OnB|~!y6bMMs3pYUOGt%F$CkoyXt zOXsJ8RYLDF9H{CD8TA6wk)3&Oou@2lQ01(=_hg)D5wLy}`CIh6qUFaj7Uf`x0!vbi z1o%xyj98tOR)B*-j6fiPtFpC9$+*%WX=DxF1J|@KG=-EDMO!|v`Ru{ZgN^biDb)R73_3h z`dMr00o?^<^G=fHu^;`PXB_r}f>aE{CApr3yw2DlpEYJHx2)WOKy$dvQm%HwO|x)l zWUx!9tOYQ8RXffuot{F37T>Tt8m=VP*fCr)xY0s8d5#^EcS_cNEdei2XT%p9|O}!){2gQ0>uA@$M;Re2V zB(*fOq@c}c(2zz4n$V$dSVox8vy+rw!mlX;lF=o?8Wu$!aAwqZxoD>tIr0$N?EU?=XiY&C_v5YkjCNU-AXMZ=sFfOn43uf_7wReLGN&$0;mff$Sh z)Q;uXq7i7ffHH+(V7=f%lHFKlV*>`^j{GZ~# zQGO7LH2wJCm?~fL@Fg2XIG5O~fP(kp#;1qV24tqA9NLOBMH>C#jxwQP$*6U9PvT{# zy8?eL9yiI1P6H3B6=Zf1*wl6zb#~wGME|Lu?V7e34m|_kYAHY z8%R;50fU)D$fxLh7N&Ej;^oQu?iOAE&bp&-pRKITT$u*MP}=trtT zv%XP<2RB#{>pK+pZvgd{1OL~eSv~IpBsUut7*H!yO}tp(#X~UxVR!DF){Zxq)uUeQ z--)K(Ri**bKSV`^|)_=e^xg}~tsC`bdPK3!Rm4-FXTz$sN(dcdVmT9=~W z^uWF$y&@Ll?DRt$I8XNo2;?JN)q4CE4P9V>H7u6u{nL)y1)wSy+V6?qa#%be(xK1* zSEcNF)*X#yky;&A3f zy-U?}*DGn9L5|bXKU`}-dJ6nX0^%*Y=|>ZB!15Qp6IyAhR4Z)B*N^J*izZ(RiKLu{E#LH>}{KSBiu4auENnn#Iu}txuLlcwyo<{ze0rI#j5xQ&_0CX3&hh@Pa z6^?66ViZx_S8#O=tDWC7RHE2Vz-H3?-V*Ig+0G<~V~&&I1n~9qg_v?3&LZgs_qbe( z9i)@yG!m|!nbS={un{RF@Byz;Z%vcab!_QjOHa1MAo8~~w=`L`B)Qi3w9z4#2-H9r z9j;s8&5{SenX_toC+PvnaU*4Z z)tZ{fJ*Hj+fX|_0^SXu}Cb$dKO^oIYz!WSO2o?|8uIn1$&vU$@+!s1{;3ePziEu&8 zFeY_X(PTgxDmak1@Af!=3kr`U5q#gF_2;KSY0AwUTaa& zo3wgyxXk!gmNSMJeo>V3G2Ctm$bjpxVm%kv8|&Eb4(n$rIkK!XGGsen>-YZMq9iL+ z-{A_T9xpeG`g2fr$a#)VI z=1s|RLLrG0%FTi*tICcgHWV3U*GalzSY=q8Uu(k_V&B(X(e?HK@ABcOBKvRw){rjHl>>03&K*hx9=W!w&Uk3Ou$X;7tL+ zr{WJ7kh+1D8llPZyhBySa6wcXox?{pVmJ3w%%a|rIfHF94oI-W;?fT!8jfSLt#+rbKt~q`q+8<$@z@2L%LEh=Fr%RwzFIC)o;HNcgE!QP2uvXLz*AW}jvo#Z zvsV1e5Er)(8*pH>c!rSi(;*CG_ni=!0@OMm!VuMeNmvIbM2PL)Zl=9j&qk_w=%^N@ zz#;8eLKnK@g+A_PQifIO-KBuv@B%gb#pos%iJhmh^XivX7OQ^fFzm~OR*fE>S?pT5 zdcgfQlbp}%{F3*{i*vs||Ne44_^FG5?^_HUoB;Vee)J)584;N4kpDL71Rm5sOOi#v z;$0erRG4?niUNewz)#c{-=MBvuFV@Igpsr??VyYlK-83-h_TR15>#7mn8b7~Sxm~e9E+jIa7&0}a z)&p4NCw3pC=$l8;4MZb}*n9l-YQ4OCLSBEjyaEh`q3U4{yMz5@>YxhAR8_p7gB6LT z;1@q5)a(E-6J&qk3ieA|!>I0Z=NIG|A|9tX6=?xrpxya`Mu9!~`NfmdU;EW^_*mez z@&N6V{pzFbU<4`NoEa+SvA&f3$R7A9cm#k;so=f|T|vYR=y<1f(YFN}KU8q^F+Znm zBhirVAg+p1cuR&~qlxaNCZS1=8y9X!n_^&tM%rt2Re?Kx_Ag9TS8(HKF*_0<8PfDi zhP0o)b=ptorTx^A_ABw%jqpLQ%3t)h&?3hjbhV4s-MCTT9ld(uB=OVl)cmsP*;)hG zEsG*PN36>9sYIP`Z4wbz6EODQhK%&%?u4g2ree_Us@nxW{D)K-e9|jy4%y@*y4Wtr z>(zxoLY~MDe}Rj5#JC0z|I79kJw9IOh@;r~c`Xh%8T5@CF|;e%;}rahy$KG+AU1|; z-QQ;vck~2r_BVeIIyVB)xE;GLwh&*7{<`7#N0n)20@9&tXnsgzvF z(;ij7>WHv|C@Uw>^C$@lWk)X z$RX+tgyJm4NJt`;N3rD)F@lXt2Cr{wU zv&M~Qk2wN3N%9|3QlfWcx#)JB-|MT@xn>97)6SA3oIhx|8s=j`0qM}1k-$gbnt=Z7 z30ywM%M*V6TyinPlU5bZrV;$0^S5WgxIdEgeFLe>St2KJM(rh4Q&)sk+YE#g=6v!U zlLL!Qq;k^s1nScP0XdJ-Dm>Wo)|%_6?fIQa@<;L`X*>%gx0&G%QXdrN@!~|YnjgXI zm8rMSl6Qj9fQLF}STGy!c=FD}ar*W8ihLzH5jj0fwJkqbu6o&x8;27T;6`a^(9e0^ z`tga03B85{$lTerJ-`$v1lXi=28Z*!na%Mzba@g2La)0VKOD5xnYGsso|gU=oqmD; z4ETK35;Dh&qayt76T*Q!u8}rLRT%K7-EEyE6bL|N?5kp>UI2J&61Q9Cuu}|8jp3xyp-4%rVYNN+L?fWlhF9i9!x z_arp=*_Tkjj;OT`pwn+?yhXPyT4@6Z^<@?{<5cMC^yiK%$Xt^awZ6wSSD&C0(LIf1 zPt6I7V7OpMRdDnbek~em5@oLj%4d)J>bM|BP3_8`*VG#81RU}t>w=q;j0;fE>ZRE~ zwm7h`wI%3f++fDd<%pGH7fScx|A*3jfP7rn`DC%?EGt?(G+Ug6k#+8v|6pjHI$&Bb z6MA-v^Q{L=qk+4P*tEEG5{9;6qI;DaOhM{L(?A(f!bdms}4q*CjN@$e8NAJB)uD(exhAnFo`TG?7&^g?O{ZilHrOkla zH87mfctKW)8^@wzR=k1pU;gN9H{mBK`}xxfN^uwXf_fg)*tEeo#os~3DJf>5ctgQ~ z=IWgNs$!u-NU8984aW+lx#b5Wn@H6sMOWZs5wYCUb8%11H%E5(>^TlRu!$y+a-lP0 zb8xwU2^XC4WJLi3HX4syT?yzFFku~@c*7cC%eYkIi0hv-%$E8dbpgjDwTk_%?Z-;{ zM3ZjHTc}p$3&G0M`fLgUf_P)h{{00000 R0RRC2UjP6A8WjKl0086enP>n2 diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json new file mode 100644 index 0000000000..0104a79c21 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteVL.yml", + "contactId": "jh0003", + "name": "ext ZTE VL", + "description": "Ext ZTE VL", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["ext ZTE VL"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml new file mode 100644 index 0000000000..639e1e5d91 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml @@ -0,0 +1,160 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +# ***************************************************************************** +# underlay vpn type definitions +# ***************************************************************************** + +metadata: + version: 0.1 + vendor: ONAP + template_author: ONAP + +# ***************************************************************************** +# node types +# ***************************************************************************** + +node_types: + + # ***************************************************************************** + # Underlayvpn Node Types + # ***************************************************************************** + org.openecomp.resource.vl.underlayvpn: + derived_from: tosca.nodes.Root + description: undelay vpn type definitions + properties: + id: + type: string + required: false + template_name: + type: string + required: false + version: + type: string + required: false + vendor: + type: string + required: false + template_author: + type: string + required: false + name: + type: string + required: false + description: + type: string + required: false + serviceType: + type: string + description: type of VPN service + required: false + default: 'l3vpn_sptn' + topology: + type: string + description: type of VPN topology + constraints: + - valid_values: ['full-mesh','point_to_multipoint','point_to_point','singlePoint','hubspoke','hubspoke_via_hubce','hubspoke_disjoint','ADD_DROP_Z'] + required: false + default: 'full-mesh' + technology: + type: string + description: type of VPN technology + constraints: + - valid_values: ['mpls','rosen multivpn','vxlan overlay l3vpn','eth over sdh','vlan'] + required: false + default: 'mpls' + site1_name: + type: string + description: name of first site + required: false + site2_name: + type: string + description: name of second site + required: false + sna1_name: + type: string + description: name of site network accesses associated with the site1 + required: false + sna2_name: + type: string + description: name of site network accesses associated with the site2 + required: false + pe1_id: + type: string + description: id of provider edge1, it can be name or ip or uuid + required: false + pe2_id: + type: string + description: id of provider edge2, it can be name or ip or uuid + required: false + ac1_id: + type: string + description: id of attachment circuit1, it can be port name or uuid + required: false + ac1_svlan: + type: integer + description: ac1 svlan + required: false + ac1_ip: + type: string + description: ip of ac1, only for layer3 vpn, it should contain mask + required: false + ac1_peer_ip: + type: string + description: ip of ac1 peer CE tp, only for layer3 vpn, it should contain mask + required: false + ac1_route: + type: string + description: route configure of ac1, only for layer3 vpn + required: false + ac1_protocol: + type: string + description: routing protocol type of ac1, only for layer3 vpn + constraints: + - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] + required: false + ac1_protocol_bgp_as: + type: string + description: autonomous-system number of ac1, , only required for ebgp protocol + required: false + ac2_id: + type: string + description: id of attachment circuit2, it can be port name or uuid + required: false + ac2_svlan: + type: integer + description: ac2 svlan + required: false + ac2_ip: + type: string + description: ip of ac2, only for layer3 vpn, it should contain mask + required: false + ac2_peer_ip: + type: string + description: ip of ac2 peer CE tp, only for layer3 vpn, it should contain mask + required: false + ac2_route: + type: string + description: route configure of ac2, only for layer3 vpn + required: false + ac2_protocol: + type: string + description: routing protocol type of ac2, only for layer3 vpn + constraints: + - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] + default: 'STATIC' + required: false + ac2_protocol_bgp_as: + type: string + description: autonomous-system number of ac2, , only required for ebgp protocol + required: false + af_type: + type: string + description: address family type + default: 'ipv4' + required: false + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip new file mode 100644 index 0000000000000000000000000000000000000000..0a4f88bd3243965ef5a140e837dbf832f4f707b5 GIT binary patch literal 1164 zcmWIWW@Zs#U|`^2;9F(pee__<{TIv(46}hk{6Nvtyp+_UoW#nof;_#-+?>4;zUMC+ z@YrpR7wkN&!Xm6ar|faG2Zx%3jKhjkQst)kvszSi-`sz^Bzyb8W4rdX%IrGU{r34r zS@l)d^&YQmkP)rAa%!n*gu6cXwLeccmy&&rsiJSh(pAu^BsG2_clDl9#*Sq88K4M$%p4r04I#ciLnWoEA&nASO zj@-(AQDC{|HHAxeUKNEu*eoDpUcG+neci&Du8)%=S(u+|efEpV)7iOAE;-||!^M3Y zS8Pr=7acO&FXLf#tJsmIr!iI;Pktu_?`d%qD?4fvU>@>M;p*a8qYK9p&gE`v`&5>Y zeI`NFG-J-@kIT0&lPfuAr+a@}+BvJ+(kCia|2FwPRbI97isbrbxiVWX2IX(-Zj^}n zo0qyw^kq?q-IX+Rxec?tMKo=-S4DkGofRHrr*Tm9^6%iqnYFJ(|1@_d?aJdb`?+Fblm4O}%fJ@bEzh(*U5t+2`6BV23HPkn z$lXiCUOvy5+rR8zpOT(u-s`iBM?=39E&s8{U)koV+O2f1Km57*66cKy_+%cRd&#rX zpYt2DCjY($wYKRCRsM5&9lF74&=%D9=$2n=(}tGGtK1xqvL`Wr{>@{1dWGBd4bIt; zvp%fR5}978^7w&AUVC%;=P!>ctC^U;&r5gZ?5bIOR_lv9qv5Sz9m@_M)LW+JP?+fc zzprf;N6vwHEy7zOuDnW=Jsaxct1?T_aP5<6PhDE81aG)MG!wqL%PBmlCGELo(CY&rjdj<%I@WIrGhgxL z_@&=-er>4QRQ0##+?;axY5Fgpe{H`m|Kj<})vC6prV7>n6u1@%>sm0K`E>~<6)bFA9r6Z2fhpn`8$x9(y zTb|o&~XdNt@}Eqb|%j`_UXKo+v>m1eYb|Dulc_2M|!U6 z%Zp)6C-+5s{-FAF)vkw55xag)Tq*R_OluB@hMJbkLb=Iy7Yqv8vHvRyqZ z7j%p_ezD8`T>GLDp(XjUySZQLXnfpiv!};fZhx*wM$}p7n;Ta}zdSi{`(O77Vqsd+ z;`>`y%dd(L@MdJPXTVh~r~nHF5KsV<7=;8ERDzK~g29K;`}sNJ%Zw^B0{k{1(E;A9 QY#`l?K$r-mMOi>R0A4o}u>b%7 literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json new file mode 100644 index 0000000000..558a45be09 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extImageFile.yml", + "contactId": "jh0003", + "name": "Ext Image File", + "description": "Ext Image File", + "resourceIconPath": "default", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Ext Image File"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.yml new file mode 100644 index 0000000000..0715993b40 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.yml @@ -0,0 +1,25 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.ImageFile: + derived_from: tosca.nodes.Root + properties: + file_url: + type: string + required: false + container_type: + type: string + required: false + name: + type: string + required: false + disk_format: + type: string + required: false + version: + type: string + required: false + capabilities: + guest_os: + type: tosca.capabilities.nfv.ext.GuestOs + image_fle: + type: tosca.capabilities.nfv.ext.ImageFile diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extImageFile/extImageFile.zip new file mode 100644 index 0000000000000000000000000000000000000000..acee3847543a5caed6f375354c5d243e7e87bc5d GIT binary patch literal 377 zcmWIWW@Zs#U|`^2;96+xEgI;naT&8Wm+IjMS;xjA!#9Q}?M z@a*|6TI;wq<~M_Yx{6&w>#>zOlPqrJ9sM_Ni7xl)-gBC>&h#wq=`AgKU>KmLe2z=I z>)PQP@58-Ty0onJ7LqbLMheWLYH7iz&<(dHK%xIqTJiul^6prS0d%o7$P4@0MfBTI$sC zV}8eNwUYP%Z$>7223$d)0t^HYPymyd0m229VPueCIQFIgNv7dtMuB^id64MJB*Z_-i467){P zVezFfYk)T+lRX12PpSaD2?7dW604WFppuLX k5)AcIx>K_aFEbuHHzz3zi4O2)WdoVO2!yFX`Z3rz0Hp$Y2><{9 literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json new file mode 100644 index 0000000000..6a565dc3b8 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteCP.yml", + "contactId": "jh0003", + "name": "ext ZTE CP", + "description": "Ext ZTE CP", + "resourceIconPath": "network", + "resourceType": "CP", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["Ext ZTE CP"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml new file mode 100644 index 0000000000..75a867ca45 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.yml @@ -0,0 +1,76 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.zte.CP: + derived_from: tosca.nodes.Root + properties: + guest_os_mtu: + type: integer + required: false + bandwidth: + type: integer + required: false + interface_name: + type: string + required: false + allowed_address_pairs: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.AddressPairs + ip_address: + type: string + required: false + bond: + type: string + required: false + proxiedVNFs: + type: list + required: false + entry_schema: + type: string + sfc_encapsulation: + type: string + required: false + floating_ip_address: + type: tosca.datatypes.nfv.ext.FloatingIP + required: false + service_ip_address: + required: false + type: string + mac_address: + type: string + required: false + proxiedVNFtype: + type: string + required: false + macbond: + type: string + required: false + vnic_type: + type: string + required: false + direction: + type: string + required: false + order: + type: integer + required: false + requirements: + - forwarder: + capability: tosca.capabilities.nfv.Forwarder + occurrences: + - 0 + - UNBOUNDED + - virtualbinding: + capability: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 0 + - UNBOUNDED + - virtualLink: + capability: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 0 + - UNBOUNDED + capabilities: + forwarder: + type: tosca.capabilities.nfv.Forwarder \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.zip new file mode 100644 index 0000000000000000000000000000000000000000..6626075fe4a67407ed41d952c2a572d85f151f08 GIT binary patch literal 583 zcmWIWW@Zs#U|`^2m^9DWJMr7$gq4g83});M3_L*5)QXa*l2qpay~^C2qammBZW{>f zd9MA1S@h28Jl|kuR<7$B6Jk0=cNU2)^(fsr>2Y1{%8pI1cC|{YIaW-XX1%#zGN9(d z0v@v`9w&A$V0$89zba`L*OfA{tBg^r@2#F16>FIvaB|_{0MYQHQ^NWV2JA}H_~>|Q ze$&(AZ!2W`9hWioX5H9+)$^D6`=^FWlkY2X`%dXkzn(1cv^i_3eDlkm($!6K9`OB? zNd0qBc=5_EwwwbZ>krPfmE3v$NPpy=2DhgRjv7x=@X0H0WM1?2w}p+wVTqRRuyRA*JN5h(x2z|(_c+-L%-VhS zSLw8ZOD-8(oR%---rIWdPNl8+wdNxxrJJ_>kN#(sXrHey!g+!@(`IF1p=7<}BG$h) zx#F!#8kfIp?5yeL>DzK@eQuJ+^X|8ncHxolUAwkkT=@CbebL_MwtpNYc{xoZCmnt> zJGo_2={4gw9G{}TpSgJUxO$P+hF@=gmlgm0T2}n|rJAUG$5Qs_$;O2rmX{WoC$3i( z%j(v@cwD^b{{2;*tyPUGh3CHR(>bjl;LXTn&wwjZRe;e70t#RfHHx{QqKpg@4F4xN iY)m)2%$S<;d1D$99pKH%2GYt1gmFOnGBCL?FaQ8o*!VdB literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.json new file mode 100644 index 0000000000..2ebc518c0c --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteVDU.yml", + "contactId": "jh0003", + "name": "Ext Zte VDU", + "description": "Ext Zte VDU", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Ext Zte VDU"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml new file mode 100644 index 0000000000..5cd45b74e3 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml @@ -0,0 +1,66 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + derived_from: tosca.nodes.Root + properties: + manual_scale_select_vim: + type: boolean + required: false + vdu_type: + type: string + required: false + watchdog: + type: tosca.datatypes.nfv.ext.zte.WatchDog + required: false + name: + type: string + required: false + local_affinity_antiaffinity_rule: + type: tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule + required: false + support_scaling: + type: boolean + required: false + storage_policy: + type: string + required: false + key_vdu: + type: boolean + required: false + location_info: + type: tosca.datatypes.nfv.ext.LocationInfo + required: false + inject_data_list: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.InjectData + requirements: + - guest_os: + capability: tosca.capabilities.nfv.ext.GuestOs + occurrences: + - 0 + - UNBOUNDED + - local_storage: + capability: tosca.capabilities.nfv.ext.LocalAttachment + occurrences: + - 0 + - UNBOUNDED + - volume_storage: + capability: tosca.capabilities.Attachment + occurrences: + - 0 + - UNBOUNDED + - dependency: + capability: tosca.capabilities.Node + occurrences: + - 0 + - UNBOUNDED + capabilities: + scalable: + type: tosca.capabilities.Scalable + monitoring_parameter: + type: tosca.capabilities.nfv.Metric + nfv_compute: + type: tosca.capabilities.nfv.ext.Compute.Container.Architecture + virtualbinding: + type: tosca.capabilities.nfv.VirtualBindable \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip new file mode 100644 index 0000000000000000000000000000000000000000..a7ad6244223f0387fdceac758a772494d40f92e6 GIT binary patch literal 658 zcmWIWW@Zs#U|`^2$Xajgtt%N-_=%B$L5ZD#ffp#6T2T^Jk{ad`s#lqtvo`efy2}Ov zcfV`@Vs=Tr9jov9!s~*Ucx*(}I@?U%zT-XWjUT@Dd|tF@!Lq#-lT#iQKdXpK^KsMW zUdr7k+qOh%fr|d?)c@K$wW?!HY{r^M}}jewBp+7-Ai@2pGa+3rLu-CVxsxd zN1PLP>rOOa+W6Y=?y8a%Tf;X+z7Vc3SR)nw^#9>gcGpfbFJhNf(>}QUmf(%Ao37X$ zOvul&4v6 z_uMDKGp4Hi@?*7}v-8MQZq<7tyL+lcE{L-0)tq#lV>zX~Q@9}ht3)3EM9D9p+D6i$X~4d*grkx@0m>t4NV1E zj7>}4CzgKux2O7s{rheC+xLE7IH%oeN32u)ku$gEd|DZ&veYp?ykPgV|4;5YwIr}! zK3BeXa^o+i<@%*i8f3E&Np7`EkZ{RZaXY)b>C-+#e&2pZ+`6uI&n`bwK z^PEZ$&7P;4yr#|E)@5GfR&Ix*ZD&qy{NmtydFg|Wr+t7223*NQ1(-lUKmkmmB^EBIFe8HmgYBxo)Jnt4j5m1Jyv#+S1H4(;KzbR0Fdj(D HGJ$viCh!<~ literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.json new file mode 100644 index 0000000000..0104a79c21 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteVL.yml", + "contactId": "jh0003", + "name": "ext ZTE VL", + "description": "Ext ZTE VL", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["ext ZTE VL"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.yml new file mode 100644 index 0000000000..8618019587 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.yml @@ -0,0 +1,69 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.zte.VL: + derived_from: tosca.nodes.Root + properties: + segmentation_id: + type: string + required: false + network_name: + type: string + required: false + is_predefined: + type: boolean + required: false + mtu: + type: integer + required: false + dns_nameservers: + type: list + required: false + entry_schema: + type: string + physical_network: + type: string + required: false + dhcp_enabled: + type: boolean + required: false + network_id: + type: string + required: false + host_routes: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.HostRouteInfo + ip_version: + type: integer + required: false + vendor: + type: string + required: false + name: + type: string + required: false + start_ip: + type: string + required: false + vlan_transparent: + type: boolean + required: false + cidr: + type: string + required: false + gateway_ip: + type: string + required: false + network_type: + type: string + required: false + end_ip: + type: string + required: false + location_info: + type: tosca.datatypes.nfv.ext.LocationInfo + required: false + capabilities: + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVL/extZteVL.zip new file mode 100644 index 0000000000000000000000000000000000000000..5f04404f25550568159e8e59942f402667ad1e2f GIT binary patch literal 529 zcmWIWW@Zs#U|`^2__)~Edlk$5X~m2T48d#+3_L*5)QXa*lGHFCy~^C2tsw{VZX59I z{jU9q)vf%jc#eag?H4ZtvAF_MHG5O;RL0wDhJ}eZ-gZ1tu}Ra;?&ZtCc{wf|CL1>t z3pKZ1Id!~lyRPJUOQAIu?myW2Km1V86!7wapm{iotx(TQ=3{B7qRk+ zuS9QD+==+f`x+kj)XLsan4WUA{hfKCkEYNmaoe>0cN8P%_$`T7XueVU-YshV({G+Mck&oZ+`&n$n?km3h|KeL| zj~n{F{y+QkKKJ|JrGFKJcU5ZKZ(DVljoZ`Xmb%OSuV({gExs?D-odm^V_IPMjJb9a zmL+n3TKv}UD3gEi>;ThCkqvjE%&UEptABO%dv(_r-(R?J)lWNB3B$(|mG@T{iHGf< zayYhzy$Iiw3^}lS;G0$7$F|*T8#Pf|_n1aTq zK+lDW=I17S)az1CcyiDvbNZr<3mF1EqdTfM3UpgPH|1ExbmVF5rFUMhch1=LXU4yn zx0lrOojnhn{*&QQ%%WTLrL1z}->cPG+gQFZPVi~IVRLHtoj2Z7B#Yy9%Kgvo_gTa9 zm*>#?O9~m!4ha2v=`rcl4xeqi&!+wT^|!%*#@LP Z8}goB0i*-GS=m6E8G$eXNUJh|cmToAF(3c{ literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.json b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.json new file mode 100644 index 0000000000..f8d2254472 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vduCpd.yml", + "contactId": "jh0003", + "name": "VDU Cpd", + "description": "VDU Cpd", + "resourceIconPath": "port", + "resourceType": "CP", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["VDU Cpd"] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..e1f6d068ce --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.yml @@ -0,0 +1,56 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VduCpd: + derived_from: tosca.nodes.Root + properties: + virtual_network_interface_requirements: + type: list + required: false + status: SUPPORTED + entry_schema: + type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements + role: + type: string + required: false + status: SUPPORTED + constraints: + - valid_values: + - root + - leaf + bitrate_requirement: + type: integer + required: false + status: SUPPORTED + description: + type: string + required: false + status: SUPPORTED + layer_protocol: + type: string + required: true + status: SUPPORTED + constraints: + - valid_values: + - ethernet + - mpls + - odu2 + - ipv4 + - ipv6 + - pseudo_wire + address_data: + type: list + required: false + status: SUPPORTED + entry_schema: + type: tosca.datatype.nfv.AddressData + requirements: + - virtual_binding: + capability: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 0 + - UNBOUNDED + - virtual_link: + capability: tosca.capabilities.nfv.VirtualBindable + 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 new file mode 100644 index 0000000000000000000000000000000000000000..6a9d4be124a46dccca5346ecca05ed5aa9247dc7 GIT binary patch literal 562 zcmWIWW@Zs#U|`^2c)P&Jdxk>%{27c43O#lVH zr!Lc25Am(Z(%4ceSjo|Ne1eA}lVM-l<5v?bvX|R@2wvdcI0V@t+cZenNYC&t`sBcJUofPA}g7XS~6pFDKO<5)(eREMscT=P4Jywk+#e-^6_P z%puOBUEM74O#Goc*sBaTirf`Aw(#h`V!b)<8mD{_WEZ{@Kil}Jef55Y^9T4HF70mB zP@cl2c;nAL0fRDmz1IF#0pS$sE0Z6b-?eR;f~u*>GwE}OE%@fEO`DsM{Nw%Rs=Yqn zIQLFnv}T{1d#zLZo%wskSx*=4p1AtglWXcM$wq<|%&xWD&VM`p_w3uk{j=k@Cs};y zUw`fccYrq|lRX2j7*qkqAqXgdN#ywCf{HORNH8$m{xNfb!DU7mJ=snA%nBesz?+o~ Rq>&K_V}SGlV9H=%008-X?N9&! literal 0 HcmV?d00001 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.json b/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.json new file mode 100644 index 0000000000..7dab2ece94 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vduVirtualStorage.yml", + "contactId": "jh0003", + "name": "VDU VirtualStorage", + "description": "VDU VirtualStorage", + "resourceIconPath": "objectStorage", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VDU VirtualStorage"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.yml b/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.yml new file mode 100644 index 0000000000..5d22e1e6d4 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.yml @@ -0,0 +1,27 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU.VirtualStorage: + derived_from: tosca.nodes.Root + properties: + id: + type: string + required: true + status: SUPPORTED + size_of_storage: + type: string + required: true + status: SUPPORTED + rdma_enabled: + type: boolean + required: false + status: SUPPORTED + type_of_storage: + type: string + required: true + status: SUPPORTED + capabilities: + virtual_storage: + type: tosca.capabilities.nfv.VirtualStorage + occurrences: + - 1 + - UNBOUNDED diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.zip b/catalog-be/src/main/resources/import/tosca/onap-types/vduVirtualStorage/vduVirtualStorage.zip new file mode 100644 index 0000000000000000000000000000000000000000..fb92ab45d9e1b9398c3403bc792b949e1d9a2821 GIT binary patch literal 421 zcmWIWW@Zs#U|`^2NUk&T{RH`QEH*k({5%s~wT*$KzRqcioKFc$z6kmC>GZWYl{1qZQx$k^q|YY^FK3HKoayC(q>z27IwD&HR-zY8U{X#CHJmc^Cdl#SX zZ`y8=aCqAL|FvGMc6Q~t?~4sX|F8XayKl?e6<+J+{uQ@*`g-@ydp7y6eMN<983Mc+ znd}*Gg_H^~tUy2kOyUSPE~qpkg9HPEC6k;Oab2w5%cTO#kBm9XvM_74>T z7yjQlc$o7==w5e^qy5vgs#>p>6;{995G0wlUnPCzlzZzANOSCYz#6Gz(SBz74+kB0 zakZ6uQ_Bx$RNSMuqml(k-=p~7=3uk | --ip=] [-p | --port= ] [-f | --ifile= ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python importUsers.py [-f | --ifile= ] # +# # +################################################################################################################################################ + +def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): + + onapTypes = [ "vduCompute", + "vduCpd", + "vduVirtualStorage", + "vnfVirtualLinkDesc" + ] + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + results = [] + for onapType in onapTypes: + result = createNormativeType(beHost, bePort, adminUser, fileDir, onapType, updateversion) + results.append(result) + if ( result[1] == None or result[1] not in responseCodes) : + print "Failed creating heat type " + onapType + ". " + str(result[1]) + return results + + +def main(argv): + print 'Number of arguments:', len(sys.argv), 'arguments.' + + beHost = 'localhost' + bePort = '8080' + adminUser = 'jh0003' + updateversion = 'true' + + try: + opts, args = getopt.getopt(argv,"i:p:u:v:h:",["ip=","port=","user=","updateversion="]) + except getopt.GetoptError: + usage() + errorAndExit(2, 'Invalid input') + + for opt, arg in opts: + #print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + beHost = arg + elif opt in ("-p", "--port"): + bePort = arg + elif opt in ("-u", "--user"): + adminUser = arg + elif opt in ("-v", "--updateversion"): + if (arg.lower() == "false" or arg.lower() == "no"): + updateversion = 'false' + + print 'be host =',beHost,', be port =', bePort,', user =', adminUser + + if ( beHost == None ): + usage() + sys.exit(3) + + results = importOnapTypes(beHost, bePort, adminUser, "../../../import/tosca/onap-types/", updateversion) + + print "-----------------------------" + for result in results: + print "{0:20} | {1:6}".format(result[0], result[1]) + print "-----------------------------" + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) + if (len(failedNormatives) > 0): + errorAndExit(1, None) + else: + errorAndExit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) + + diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py index 72198ceab6..d45b27e755 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py @@ -85,6 +85,10 @@ def main(argv): fileLocation = baseFileLocation + "heat-types/" resultsHeat = importHeatTypes(beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsHeat, updateversion) + + fileLocation = baseFileLocation + "onap-types/" + resultsOnap = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion) + handleResults(resultsOnap, updateversion) errorAndExit(0, None) diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index 117a80f9d4..8955c7272c 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -248,7 +248,7 @@ ${project.basedir}/sdc-backend ${docker.tag} - ${docker.latest.tag}$sedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${docker.latest.tag} ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile index 95d452f677..d418d4628e 100644 --- a/utils/webseal-simulator/sdc-simulator/Dockerfile +++ b/utils/webseal-simulator/sdc-simulator/Dockerfile @@ -1,28 +1,13 @@ -FROM jetty:9.3-jre8 - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -RUN apt-get -y update -RUN apt-get -y install apt-utils -RUN apt-get -y install curl -RUN apt-get -y install vim +FROM openecomp/base_sdc-frontend:1.0.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ -COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash +COPY chef-repo/cookbooks /root/chef-solo/cookbooks/ RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties ADD WSSimulator*.war ${JETTY_BASE}/webapps/ + RUN chown -R jetty:jetty ${JETTY_BASE}/webapps COPY startup.sh /root/ -- 2.16.6