From df2716420918b03320c1ecdfd722cf5a85bac280 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Fri, 6 Oct 2017 23:05:25 +0530 Subject: [PATCH] Normalize all env with OPEN_CLI Issue-Id: CLI-66 Change-Id: Iac377cf4cbd3e4d7419fcd41417e4c8bc127a03e Signed-off-by: Kanagaraj Manickam k00365106 --- README.md | 34 +- deployment/docker/src/main/docker/Dockerfile | 23 +- .../docker/src/main/docker/docker-compose.yaml | 5 - deployment/http/lighttpd/lighttpd.conf | 2 +- deployment/http/web/index.html | 109 +++--- deployment/http/web/onap-cli.png | Bin 29672 -> 0 bytes deployment/http/web/open-cli.png | Bin 0 -> 12119 bytes deployment/zip/src/main/release/bin/oclip.sh | 2 +- docs/cmd_help.rst | 415 ++++++++++++++++----- docs/open_cli_schema_version_1_0.rst | 6 +- docs/user_guide.rst | 4 +- .../fw/error/OnapCommandProductVersionInvalid.java | 2 +- .../org/onap/cli/fw/utils/OnapCommandUtils.java | 4 +- .../resources/default_input_parameters_http.yaml | 6 +- .../src/test/resources/sample-cmd-test-help.txt | 2 +- main/src/main/resources/onap-readme.txt | 22 +- 16 files changed, 422 insertions(+), 214 deletions(-) delete mode 100644 deployment/http/web/onap-cli.png create mode 100644 deployment/http/web/open-cli.png diff --git a/README.md b/README.md index a69963b2..a400bb0c 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,21 @@ Provides unified commands to operate any cloud enabled software products from Linux/Web console. Configure the following environment variables, before using it: -1. **HOST_URL** - Catalog service URL or a service URL -2. **HOST_USERNAME** - Service user name -3. **HOST_PASSWORD** - Service password +1. **OPEN_CLI_HOST_URL** - Catalog service URL or a service URL +2. **OPEN_CLI_HOST_USERNAME** - Service user name +3. **OPEN_CLI_HOST_PASSWORD** - Service password To Run a command ----------------- -Type **onap ** from linux console. +Type **oclip ** from linux console. To Run in Interactive mode -------------------------- -Type **onap** from linux console. +Type **oclip** from linux console. And use the directive set to set the values for following parameters: -1. **host-url** - Catalog service URL or a service URL +1. **host-url** - Catalog service URL or a service URL 2. **host-username** - Service user name 3. **host-password** - Service password @@ -27,12 +27,12 @@ Set the product version ------------------------ CLI framework is enhanced to handle multiple product versions at same time. so to choose the product version, set evironment variable -**CLI_PROUDCT_VERSION**. +**OPEN_CLI_PROUDCT_IN_USE**. NOTE: In interactive mode, product version can be selected using typing **use ** -Run *onap [-v|--version]* to see the CLI and available product version details +Run *oclip [-v|--version]* to see the CLI and available product version details Set the parameter values ------------------------ @@ -40,15 +40,19 @@ Use the directive 'set' for setting the values for parameters and 'unset' for un Help ---- -*onap [-h|--help]* -*onap [-h|--help]* +*oclip [-h|--help]* +*oclip [-h|--help]* Debug Mode ---------- To run in debug mode, set following environment variables: -1. CLI_DEBUG - By default its false, otherwise Set to true -2. CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number -More details -------------- -https://wiki.onap.org +1. OPEN_CLI_DEBUG - By default its false, otherwise Set to true +2. OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number + +

More details

+

https://wiki.onap.org

+ +

To download

+

Please download Open CLI Platform here

+ diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index 777e3ac8..e23a3c1b 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -10,15 +10,18 @@ RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.t mv /tmp/gotty/bin/gotty /usr/sbin/ #Environments -ENV OPEN_CLI_HOME /opt/onap/cli +ENV OPEN_CLI_HOME /opt/oclip ENV OPEN_CLI_DEBUG false ENV OPEN_CLI_DEBUG_PORT 5005 ENV OPEN_CLI_MODE console ENV OPEN_CLI_PRODUCT_IN_USE open-cli -ENV HOST_URL http://localhost:8080 -ENV OPEN_USERNAME guest -ENV OPEN_PASSWORD guest +ENV OPEN_CLI_HOST_URL http://localhost:8080 +ENV OPEN_CLI_USERNAME guest +ENV OPEN_CLI_PASSWORD guest + +ENV GOTTY_TITLE_FORMAT {{ .command }} +ENV GOTTY_INDEX $OPEN_CLI_HOME/http/web/occ.html #Copy CLI into docker ADD ./STAGE $OPEN_CLI_HOME @@ -27,18 +30,18 @@ WORKDIR $OPEN_CLI_HOME #Setup the run time environment (RTE) #RTE: CLI RUN chmod +x ./bin/oclip.sh && \ - ln ./bin/oclip.sh /usr/sbin/onap && \ + ln ./bin/oclip.sh /usr/sbin/oclip && \ if [ ! -d ./data ]; then mkdir ./data; fi && \ - if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi + if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi #Create the readable README RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/onap-readme.txt #RTE: lighttpd COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf -COPY ./STAGE/http/web /var/www-data/servers/onap-cli/ +COPY ./STAGE/http/web /var/www-data/servers/open-cli/ COPY ./STAGE/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ -COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/onap-cli/onap-cli.zip +COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/open-cli/open-cli.zip RUN if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi RUN cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/ @@ -49,9 +52,9 @@ EXPOSE 80 EXPOSE 8080 #Start -ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect onap; else onap -v && /bin/bash; fi +ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect oclip; else oclip -v && /bin/bash; fi #Cleanup RUN apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/* -RUN echo ONAP CLI docker successfully created !! +RUN echo Open CLI docker successfully created !! diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml index 370ca678..dfd3bb20 100644 --- a/deployment/docker/src/main/docker/docker-compose.yaml +++ b/deployment/docker/src/main/docker/docker-compose.yaml @@ -5,9 +5,6 @@ services: image: onap/cli environment: OPEN_CLI_MODE: 'daemon' - expose: - - 80 - - 8080 ports: - 8080:80 - 9090:8080 @@ -26,7 +23,5 @@ services: environment: OPEN_CLI_MODE: 'console' OPEN_CLI_DEBUG: "true" - expose: - - 5005 ports: - 5005:5005 diff --git a/deployment/http/lighttpd/lighttpd.conf b/deployment/http/lighttpd/lighttpd.conf index 03765bf8..07a49644 100644 --- a/deployment/http/lighttpd/lighttpd.conf +++ b/deployment/http/lighttpd/lighttpd.conf @@ -24,7 +24,7 @@ server.modules = ( ) #server.upload-dirs = ( "/var/cache/lighttpd/uploads" ) -#server.errorlog = "/var/log/lighttpd/error.log" +server.errorlog = "/var/log/lighttpd/error.log" server.pid-file = "/var/run/lighttpd.pid" #compress.cache-dir = "/var/cache/lighttpd/compress/" #compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html index f8680f08..263d2bd7 100644 --- a/deployment/http/web/index.html +++ b/deployment/http/web/index.html @@ -1,70 +1,61 @@ -ONAP CLI -

ONAP Command-line interface (CLI)

-

One Command to command whole Onap !!

-

Provides unified commands to operate ONAP from Linux console and Web console.

- -

To download

-

Please download ONAP CLI here

- -

To install

-

Please follow the instructions given below for installing ONAP CLI.

-
    -
  1. Un-zip the above download file into /opt/onap/cli folder
  2. -
  3. Run the following commands: -
    export ONAP_CLI_HOME=$CLI_INSTALL_DIR -
    export CLI_PRODUCT_VERSION=onap-1.1 -
    -
    cd $CLI_INSTALL_DIR -
    -
    if [ ! -d ./data ]; then mkdir ./data; fi -
    if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi -
    -
    chmod +x ./bin/onap.sh -
    -
    #Make onap available in path -
    ln ./bin/onap.sh $CLI_BIN -
    -
    #Print the version -
    onap -v
  4. +Open CLI Platform (OCLIP) + + +

    OPEN Command-line interface (CLI)

    +

    Provides unified commands to operate any cloud enabled software products from Linux/Web console. Configure the following environment variables, before using it:

    +
      +
    1. OPEN_CLI_HOST_URL - Catalog service URL or a service URL
    2. +
    3. OPEN_CLI_HOST_USERNAME - Service user name
    4. +
    5. OPEN_CLI_HOST_PASSWORD - Service password
    - -

    Web Command console

    -

    To open Console, Click Web Command console

    - -

    To Run a command

    - -

    Configure the following environment variables, before using it in Linux console:

    -
      -
    1. HOST_URL - Onap Micro service bus(MSB) URL or a service URL
    2. -
    3. HOST_USERNAME - Onap user name
    4. -
    5. HOST_PASSWORD - Onap user password
    6. +

      To Run a command

      +

      Type oclip from linux console.

      +

      To Run in Interactive mode

      +

      Type oclip from linux console.

      +

      And use the directive set to set the values for following parameters:

      +
        +
      1. host-url - Catalog service URL or a service URL
      2. +
      3. host-username - Service user name
      4. +
      5. host-password - Service password
      - -

      Type onap <command> from Linux console.

      - -

      To Run in Interactive mode

      -

      Type onap from linux console

      -

      Set the product version

      -

      CLI framework is enhanced to handle multiple product versions at same
      -time. so to choose the product version, set evironment variable
      -CLI_PROUDCT_VERSION.

      -

      NOTE: In interactive mode, product version can be selected using
      -typing use <product-version>

      -

      Run onap [-v|–version] to see the CLI and available product version details

      -

      Help

      -

      onap [-h|–help]
      -onap <command> [-h|–help]

      -

      Debug Mode

      +

      Set the product version

      +

      CLI framework is enhanced to handle multiple product versions at same time. so to choose the product version, set evironment variable OPEN_CLI_PROUDCT_IN_USE.

      +

      NOTE: In interactive mode, product version can be selected using typing use

      +

      Run oclip [-v|--version] to see the CLI and available product version details

      +

      Set the parameter values

      +

      Use the directive 'set' for setting the values for parameters and 'unset' for un-seting the values.

      +

      Help

      +

      oclip [-h|--help] oclip [-h|--help]

      +

      Debug Mode

      To run in debug mode, set following environment variables:

      -
        +
        1. OPEN_CLI_DEBUG - By default its false, otherwise Set to true
        2. OPEN_CLI_DEBUG_PORT - By default it is 5005, otherwise set to new TCP port number
        -

        More details

        -

        https://wiki.onap.org

        - +

        +More details +

        +

        +https://wiki.onap.org +

        +

        +To download +

        +

        Please download Open CLI Platform here

        + +Web Command console + +

        Click me here

        + +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed

        To download

        Please download ONAP CLI here

        +======= +>>>>>>> Normalize all env with OPEN_CLI diff --git a/deployment/http/web/onap-cli.png b/deployment/http/web/onap-cli.png deleted file mode 100644 index 60c3e151a7e78e418fcc72e49d68f565664fce07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29672 zcmV*jKuo`hP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&bA3rfK~#8N?Y#$} zZdX1Frw_4fY1G1vU|cS@3TPWB1O%^G{JZ_P4hS#ys69AnNk*IJod z>b>E0S6^j6^`ht5(&D_;CMGSP&s#Q^wM-^smdP3<*B#R^`610PIUh$bWs=`O10A7+ z+o6Pcl;(E)8v&7y3phc@2HkGlQ4x6f%~(d)I2^miW7B#Qa84p(e9SK76vO3%F)|(F zS4nc>iKzn}?c1Q3Hx%PXU6Lfavz$W6G2zFt5da;X_V(%64375SiP((j*jzR!#*A^` z6BPu^p)3^X2b3{&DAFVBNUY{$j;FFziZ z@B|v?8h4D-2Ji9FcN7v`Iv+Iv9GhZ;h=XpgB>L3{^4q129H8ifJOnvYLy^Z&ZqI5g zJ1_P4qDORGehG!}kZ=?}mQSzSwfThw_YSx3*kL)>M1f<(=dsZvitfSC24c@5nDU1d zP-GOV^Xf+o9v_AO4jMitIqHhtdAuHDlo$t;YYbc-q@VGOA&=x|jO2BpPx1)lf%0yE z;}{r?xMNH>LrG5I;{AV=GY-hZLTC)i;!5g#6o1lwqj1j`2LZ~3x+e+3DdC5bQ;dl; z@{QUrP^>aEYNo{RQ89iLx54CDxl<1Qy-gExe-bZGY)ewdmP=Y~>{szhlu>@(vXVE; zZlsI9V;P52$Y6t#YupIla1G?nx>tUkLsrqjImB^-aE0vLCI8X+5`xysPEAZ$E*pe3 zjJ6~agO?M|4t0+RCkm25=>8BSfZ<9?_v}3)G{Q#3MhQd;AzNz6zs^Y#Z%l|Z&Jsi} z1RO<5BVK~N9pv&fo`*9eNs{YuN*ta}^>c=hAY7$qq&`gYg(tcEz@Sk5(Z-F%6t6M0%(AU+7SWtj@814jTQ(^qjpt<)n?B&-tl)xLzp6M-Snn*qEn&{93&7 zFvZk(m0I2mwIvvj_=XZ@&y~9CP!;yq%A`F@&5Kq z$lJ?vuF#wwId+DJv-}&WLmg@HP^XZ7L@FoxgGAvMU(&(Jm4>so5BZPf5`uIJe10v# z(8rzKMD71 zR&k!U2fz{H0WpeR0BMu2s|MdkpdYYhN^>?>3LC}XYCYfp7`~Xbq5Iv*1wN( z9!VAyCyy6Gh8ujLP!CQ17~yoL6Uc`&FsXN)SHTn=Q-s!oCuvAn_<>nrG-_-B{0Nhi zS6F$H2rq}%OZmb|h*yE1B#mER5>F>9oX#2$uYdfZ!qH8pc>TxocZZWARk+J&C@{%S zWk|rBmBZ_&QWQWe@i7M+goN|}E(G!yM$XWd#BriJ_?=B@sLufP28$At-pf#Sv=?m^ z>+IsGK0vrVL6U}Yyw1)QqG%f@PVOf|xw&M(x zl7*M3Fk~cQPv(H3e)!4LI~ZYA1-#RV@c5+R={*0VI@CrrPp*ejGH3vjc)e&_k5B*w zhcxiXB_1!(%L~=gpZo)r;kLTsv$}v#A`H|bD$hZ(hP(TLn6-?e)@iNK}q>xpr9nbD0wvq z>jK@RRHD&9;c2|Z5O?>|)5LfqkXy{e|7l=2$%i~Vu`|iZg~6Ld${(*ifGzsTJju^T z*Tk=ML<7Xw#6B>38bBep>J|hPKFX1xsevdJh765^P{OQ#vJaIdO-Sd(CD-Hvk~D@_ zn?D~~ln>XUe1d5LDWTke4=21XtdvV~;^;8q@l%AS9Ssj5AJ2xNKu+hO-jpLZ0HPf{ zAL7WL>p{$+kiVyfhjd(9auDR{TpEMZ`N`a`4^R-M^osOw%J5R<^x%+ZU?79w4+9WC zI`EU9E`aun{S?yctUT#McayWXF%0D86$xSFLpc5F^>8jP&pq;a9q|yx1u{_K_6me- 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 diff --git a/deployment/http/web/open-cli.png b/deployment/http/web/open-cli.png new file mode 100644 index 0000000000000000000000000000000000000000..35f2b1ecaac9560782c54b78fb577af3d69d4fde GIT binary patch literal 12119 zcmW++1yCGK6UCu$4bI{2?ylj`;O_1YIo#cYyE}Xk+}+*Xo#1Xi{8zQRH@iEtJ+EJP zb@xoTqP!G59y}Nr7?O;%xboL^{_ALkgZVly5*xFAUBI1{r9{E1Ckalz8c^mUaw1@0 zb+HI_ z?>DG}xD2ByD%y=hj^N0$yNW_K?ibn<1!YlLP}fgPCVb@wGXXiFVPF6vC+a4SqX>*c zh2=){AmYz`5b;Z`Ghz2*VYM~xJ~VS*``0@D`A%n~U+!l1uftm1Rn`4XHO)~Q4Hp;J zw>m62z6JZAr;F#szt30SSzplY*=!Er;}`F3W&Pajtnw+t!)$M_=udXV{o z>au>iAOkcl?8W$f3PmSaNioQz|3qXi^%FA7Dhk6ivAaZ~;F!~!aL*8MklbA|1Q%0S zg=KIPx+4p=pZE(7kXBo9t#w`(78=Sgo^G6YABM>+w?5ua5Vqdzw4O$VKBxZrehya5 zdPZnyt+FYjw7&-;0TzZi7?kA!IuIpROZLPp=5phj4gt){i@egsTVO@q_ZmxLFRz(1 zJ7JhFL?k9*B<1}uAqTAV)YM*L#%-m;7mZZLIv&W>&jN3U(T># z#SrAe{ha@ARi^u-=(dR+G{WjM_+U40yiO7FEs$xn|CG`y5;kJyupJzH>)a75M2w1q zaEvSasccG;g9syy{O0F-!Zp~CgiZMA&X_Av{M5x#tb2<`m?F)*fH@r1Sm1e5Qh-nC zmXE)(>9l<@ft#|-WeHM{PEyCs)g|YI19u6X;%dTr(ScJ1(nWGL5P^1zq2l9@S0Kn# zNX3C$sT=H>0Com)tNcv>7V8hb1Qv>2;SLx`DbpK1_Kz&0R)zbdrg_nTp37qMT7nFO zpnP+2D@N~*Fdix|ff6ZBC&&f+GRPuGWZ(rCYCw_x@4mj>lsP_d)M}p|V|8Q^tYKs%qYkNg{zarS z*aNCEbQnq|u6qp0b3tDyeg97dog+X#D$r>^_j&14vD79mk@DE#WMw zkkbBVb__<1K?m`l9>hqq7vL{3tl|Rx6B#6s z+Hk1XF+m)mW~<&yXGc4b5?qLoSCxk;&841cO5uim*X(wc$V`xqtAtwru!)Ii4}69# z2gh{^0w$4CC*b#|pKcqs(#IU-N0)jcTQAjzMv0$ox${sdLxukGqvn|0ixtXNQ&Z0* zg1tAq0l0Iw=s=Ce3+o`HNcRZ3jG$G80_~*5mq{wQ@&2-d8S*CXz*hiS(Mtx5|A)6_2E-6SUL6sGz zpkJY4Jd@~%-(b5>TFA~ilp-5O(!_ov;O8YKo;Gr6T*|!~*+}c^_BhY6{lX(Q+2^QZ zE-Qg|fbj$`gA$1&Fv4v*7mGS42ZS7N6pxhI z9wvoJhp={pTSoft6LK>0-sFqyo`xxN)`|&|;UaxY)(XWS)w51hhA8qbA?5^Zd0yoyFl9&zgg?u9$o=(HZKV_}Zg%LZgKWL# zgXXyIbiIxpPBy-*gCvKmgmQ2zM>1Ja5|!C>;B7#)b5*3QA zob2F1scglT(>sse9i&KGY2-sfq%}uem`@dNxy*U85Hi7#!SbnK-yuYNZhss>hmTWqb5q4-bVqa;`dwr3C&7iDiD?!$IT=i{VPhM3h*VnLpVGLC;0wG2RNkQ@FO{ISK~}W;#=k2XFH`Cz%re z5SX-~%qoT%J%%YFCDE1^YsJ^b_XKQ-S)Euhq0mkPu?bhln*b{#kP}l0cbLG z5^4bD#6Ho zA9am*b5f;Tn)dnWhEFD}SuNeKgnX@|zSO5Im<s2Svi;qfQ)g%`WbU1BrPc z{qr{ZM+&R-bmJgW3J5;QSc0fJ$EdXJAgt)$PxTxF#tZx!d32UbYBi(IKa6PCpmXl< zbq9)>0GjuECf~myc%cUerbys9iqEtmy$wq7&3jTlTfzIYf08bpoW%Vpvi6i7xuGu3*8k*BV#=z@aP=Ix=iEM9?zK~=u@}ylt^+}gr^4|} zZj)!mj!`<)88I-H-d$oL?U=!`*M(z6#tF6E7YiLwBsZjDWiy6^7t|xl*x2PAqp@fE zDt$|`2dpIy=!X0xmC@;=swx)g4&e?0mNchwGD$mbl==-BXR-pQj_pC-%8Vl)qW`E9 zomHj#{d8jLbqM$nXtTH@BKIVflmLm5r}Z*Pr_V4o&NPGAbBv5I)yU~|olc;Y^irgu zSiqEEvJ9kSzW~9a7Ev;FR@mG(7ZH9T|6*E-)*9{$pJ8WY+m~_dG}Ihb z6UdB&(xG@EjWo(BH3nUWH=)ARvBvpj+S6N=q}71Rox`HtGc@D za;M&oOtIWbuBS1p6;;ZR0tU?SmXMOa61esCx4TEh)LY z9~=&~gx7(7Da|DY%XH>jpn^M)LNU-t`tffbV-O9z&`?ScaxW4yJ6>`g=FhMjZ;O<^ zd&M+@oVWS8-H2qW)%jgP7^2BY;Y|G)7n$!AL-1d(v&q3pGU_aB}!}^4{#A|D4hm3DGu|O*R4;Yc%*J%v+t*;C!+)+2Tl?+ zfvrP1aYa&I%^np&F6y7~}FoCABR(3wwoBIu} zdG!XrybT|odAhMp+(t0fif6N%e>}cAEGKF?rT|jjGDLh^{RbIN2Nf;`HuFY&Bf&3K z^Osipl@&KE{sba_7NuMNQM^SWHe<1@R$3lGLe?)oj|fd3K5a*4bk>I*rig8|3|qI% z*i5|6HpP!IQ`RWU*fRgGC`IQ#k}6BGDX(W)#w>bYo=y1`$||lkde@v{-IA5oQ-Msu ze|QSco4WX>6MOtiOJx-u8M91n=l}h^o#ONDjy>0dQ)tK%BKSjxWrKQ{l1`q@P6{%WKL>oID zP#wkmB5fB5_5902DI!$01o#|^Ws)+)!Ybje^d`m%Len$~7OxyM0QXgzkXHbo>^_h%kUmgv5drBCi2R zs|1u+Ga8^~5vKo9Sz3w%`%9L9CFOjoZF`Y9FI8uyth7`k6irJw+sK)@u3-!UBuN4R zEDw9kEYHt30y|VpqeP}l+A5FYzL2A5PujvY6b%+o#3kca=YL(9n(T~-*a$O-lshPv znWhF}7E1EgiLeE~M|Wg0D+m`yGIerixh`s+bo)b|v`l&1$(NNb6V}4)a{QhNO!+Z^ zuKmzo{WPWg%%j4LoXx_R$y7!Jy6U-mzw{N_@P6DlNw=<+@%^~XnfrKuony;+9=~fp z5@3>5RXI24M$>+1=plNQ@lz?h^;3US%00r7=m&(ow_o3t2nl%aV&q8szRcy!rgXg> z+y!8_6Tkm+?~+yUKK(W4oPC=~uc}lB8BgQy##*=A2A!sI{Ty_I8<>s3x+lFAqk355 z`+hdp)b)OGx778)(Q)a0c^hirA#Rf3SE9}A z=MNBTa;78PJiXfRfi3C%wtYEK@U;>fT-*A1xV!2@Q5TaO_+}vNxgR(54uabNHwsen zN@My)78D|GC^F$s6oEU%m)VrgB*rf@`X1X&_{aEfqEkx*BU4&WBGukm#cU0lux+*N zOy^0NFW}8N-@PNa+INsn+P2=S|6+w89(o}nRD4aN!oO(UnSw1MjCEWLjU^T@&U~l+ z{m9Y|>-6+^reO0hx`h9Lrtz3X!Rzw(R>tP@r2Apg#Lke=hvUn+xll&u!`~XuPS?XU z^VM!8B^D-T+Lu1S2k}Jx@G0zo0ccvUjrmH1@vPkAhwG*%X%f02Nms4o-7yQ59d!16 zrFmK{4w2sL>Qb?L*XzcKoW0jC`3-{3t6(M#jE|d?u7+LjWLSQh%--BG{Xa9QTCo= z+Q90Rj&oB@Be%DQrY?>;Vw`mBiGit0;f9C^OG8lsxICNz@OVkB5&L6Wb{rV=A9WA1 zVpy#r#m3sq`__>AUgvc~Z$(nIrwa@>lN*gprah$&hX&FUXxDT_OGe3 z8(y{?WfS~TV!?&a`yo*pkULpx?&oTM{-ZSuhxv%dXQ>nBVLw4`RjqMYP9A8E>4^7f=wky{zQp7yO|w$5KM+liYhz zcdbhujNb2O`cukSSlTEWO5EbZly~TS;{eZ&KTP=zfS+qJ-Iy_}rns|HJ`Zg8EX>@X zFQt#6f4vQxgeu0f_-`ll=R+M{fUv)$sz6PyDk-3CJsi|)aUEsOPnPAr>FGn{aJAjz za+KxnB^`Fsk#EG8`)_bl$DiiONrk)@P)7AxZU1bzDZPQaorYC0scF>@xx?gh9qGe8 zu5((%UlLE5>s z0i;Sn0g4fRic+yf#<3GAig722Id3LjLwuX@#+;!-AJ?&q;u^1iQc^melJj&IB(b#p zd*YaU$Y_5IiWX!as?j|2fdsfs|B{Pl{jPrK5n!J;9wKrUxrNX&CKB@TKC5af{&vNX!nBw`q4PEH-dFox1RO|TV ztmZLLci8ju{ZXA&)doKo8q=TRx-STvDP&l?--t7XTnH~XW|w3k90oztzWrJ)v)f0s|6hw=%gQjY)(wWBj@Pg#YcCjA51Jc$^BRa%}Hnqkc+o4Pchn zTN!0gB%TFO%~Z?~ zK$-CQoXo{}(b zpCQtFKYO!S=Ak062tF*GDZ=V)M8RjbNF4D*@X87DB{seGf)K(K!qj1?{^!e*Uegf7!t1}bnuIc=NAQUttk^tV zqS=ApN~x1OYF9AT44G~ATUu~6ntU_Q3Y=HE@QWzf)CMMH%UQJ{t)Cwr(8K)x!s8hM z(#7aOiI6o$!$+1NDOE_5}x=R^NLhL)YIX2saa(dQIVuD zfW$PyozW9EaIL;!=-&v89)4MADwe4SthoWa8LU_$WvFbxH2xdqyq1>EX*6iMCO@AP zE^u=vQ1Y4%45}Z$)AC>Kn;H-YOkifW2a~K98cAWYbj#o?ZbH$1ae!r`;y&1_;jAKE z%n^Pp*IWcrC+A!&w>|C?yr`;-!?0uYwZ7rET33h=TT|$rY25E>vZw0bTuD*lp#0Q+ zK4U1}9f2gGR#&lsp^SdoQTTTt{&*II9rYXcgAuR$u1B05ZzJvro1o4y8ZyBh?#!;6ybxTCn5qq42nrjj*>bcc}gpsczs6!K3v+e^v(a9 zM}vMgZ%V=v62XRoo|EL&)CPKaf6jX|wh`K|n%*9<4Cg-M;s~6{_GRB zUa^U36(#n0qKdR$2~I!8g51)deaM()*7DYI|#z(S;>Ratx+0T0f}3gjo1<98Ze6pWXHrxgknjjj`6d|){% zFD)JJE)OL-JtJHu%TDFE8W0m^PZD_P!^F|-sQF4PBoAdgIy9|C=p|i34i$q1`$MVP zu&}UMtH$yQ!MXURLSiBqFoB-tsR5!Pw(@;dP-r-@=v* z=LX&k83199*`#Pm05Rx>iqcYM(GimcD2aY-7~i<@5P{gcx1Iu=!{lIJ5=0|?B_*^s zxZQ5-c-XFF1+$2^=Ej>IGIo`fzQ1r^aA68#co-f8`dVNfiDaY7#$m>`{`VI`s4Q6t z3ybX7m$a80tqxw{9Hr^VF*m&5Bd!RGN9RcKD=q6r;qGy$MjbI+XD+JO6sxO^6<0~s zlxCNgkdWw(`Ubu&8woR_7EJ*^#0gGHCl>YWS)&k>@^1Vqk%|zkOtLu;qsRj}wR4)O zupnaQMcntIRPnEfYT(j+*#+vG@Zlc+ zDU4SWg=z>aR6UeH4MsBN`Tt@MMuZHOLjI54p+f1DO1YCS^-I>Bi{y8z)(Dkj`1WV1 zTGr{|P@|en>BCt|iGG118ArX2&X}=6W`6am2p{BFgE~U<)eE%riYX zxHgY%0K$9ao1^j`f1#?mF{};3o&7Y`PFeoZsobuA1G@wc`s&zi!op^R3@sZL9$RM; z#>Ns#OW#Y~G9f2YEPR6?j?jb@ta=Aj#=Kh5uXHzGc)zxq zrKmC^fQb~*kdD@xnzUABc;L=l9bfYcf7b1=M&`swoisW<6=Z#nyFw3NNyL{s_vQ!n zFUnxv&vGT3R|i=WN*HNzzu!^GxFw00=n49?e+29xHov`S&rPTUhV#q_1YJy9cQSZt zH@H2hHyr!0cxs74=kn<6rK!rT_^=ds-(5V&YR5qFeYI0M5jb$JUgM>h#vFq=K`~6~ zqH+N;-?L>WlA5($>R{M#QAf6;K`s_^Uyn<-V2{|4Ek|0~yUKGpD0Hu8;YufK(oNYc zMsOL#{p5UK^7YjBvWx*llIbfTl*ovsd9DIE%NTI}f^&G z7;Jnrn3oI7#Qz)Me=bMGfe(|eN4em2*giN>bv99P+5MJ`7pE_eu12>YiZE;S@O#}*eX zQ3_M0f|b_G+W1)d7?!NZDoOJQGcx3CoyQ1bCjMIDGZ3^e=q@?MnD(l#PKI1I_f9XOorQGo#N)8;*XQ3FB z3z8_WA)5T~ByAA+eKh=4>4*Jw1el|VU3VLc`q3FZ7^*ZL3ZxXrP8-A_Ev8iN1kalw znGWr$Ld&G-ai)4u=63)5<+Y^BRqRWlb^Kf;s>~7nU!0pnJ89AHf7&H#^TSPluY0lc zddgjjHG`&DeI)hmtK@%&A{^kew4N59yUuk|9 z$cVqcos5r*eK|LGO;^s{XFn&SPJ;ykiZG!jiXAFMdYjLRnzzT&AhrB^VY}h zNPUQVyODT9ua8KBp%^{xYiicUi$CR@;gHe>H}=hE<#nCYV4_(VC`sp9A1>`mT&Fn* z%qO`BfhcH_CgJLwyJ;6%t@Hw90KYAU25^Xa9%e}OJ;G-KRq$hW26uz41zyVMiQ77| zlg{7&xkI>UO@UJEW?iu}U19FPR8#xj|u#xXGC z`D=Woyktp|s=S^xF>mOv#G)5Y=D=LG59Kk^b6-ggdgjMV07Yw5r$dGV)|XwRZW(_} zp4b|}vWAAVZ=(G#KXgs3D#n72$>)~i{SW^vHO$*0B3r|)i-VXV{z?W=jThnk3kO!D z6rX);bd4wvQ2XcN?8CM_&8Rb9B}u8nW`pz`p6{2~t(yQFn;R#*N7NXo8LW6ALQ;0G zPb#+=E4Z{kFd6)(sMmedo0yS zWALiUdYDIUjoq+w$xjMFZgF}9k+S4MV50r1VfY{ZtnX`&uS{T%Ubp?ZSJ=>5SaTYX z6C*nyx3580`bV_NPQ5KMJs`L<8e6nW7f9Ng7=TZ7RBf8dZiMcyO zt7A!tafRR3nE8krg;+tl6d=Sr=vHnJaKM^g0OU)+{j8*#Hp{oWY{!@%5L;|CS7~LN zN(0U{PH>NB0F#zf>_^iZCL3?=y_DG}On#nBKFKJavDj-cV=_4fukcq?BogV4nNo5I zMhR!N&P>m9+g*~nx$7Rk-GUe!ES(g>JQHQG>>2GxJqx59=}6~3tw`tM@BaF}5##;z zxeh@Cycr4xk48N1%kZzv)aeXje2nmIfzdYA{o+b1T^oGK4TQrX;vGMo%U0k@Gi#oS z>RBHN3b9j@tBN!mGCcV2Y&HdNgnZ*}Yb)(zh)KLn;P+#G3T7}T9xB|{=%|&JKw309 zgPDnOz_(6(F;;nZpC)HSiesMTe-BL^QyXJukUz3-OHM04myOJOC1&Pr>fXPu3Kf4k z+-@uyb>Peo2(B;hUXn|~rZtDLW%#&)t{mO!PI{>Dg~ zE}dJ*z*ogi+w{C;da>c*(D&FSb&IoXjpPn$%o|+J+l2b^2ySa^)!i|UP@RtUR_KeqF zS~BpW?_6dLJbLTiZY7JW(+e`KyG)|=dy>QKzdvp9t)kj;Z%OBLPaXhOzBJ_Y_HzvH zD`u<{oj_6{3HJMCyItpIKU9+5m20Um^ zmqCU_;4fqRk$F?qtb=uJ`=rG2N8Z!|P647OvZwK#ADgUwuCFUq50~wa(Stn%a+>_XX2Cdgv?f?>TH#r|$n*>DA z`?!rE_T)*TA7HH?ZbEshm%>Ze*R_#}U#~bSe6Bu*Gj8mgsL3UFnM{FbMNnq~zXf9qTQu zGdvT^7G4IUO=5;t*|{HG0p=$KabM?`8HQdl#Zw%jG z4(rXpeIkx&Bns?!vZ_o{rBr%@hdoj1t`1-{vJPE|vP$;@7MPe?Ebxb}H56x}SDBlQC_jE-KDv; zH9<|yeI_HM%J^Jv@>enCFDckfv&hYc#o-Aa$T^w^A+2#NpX=x9^-)X57b85PtSjtn zYS2sx9?n;cxr!yPpvr?b@@nG5GoR|fE^JP26%~9!8CtEUAI#3p4ryElEk}Zi-=uFB za$cNuR=n@ZL1Os1uvzU*eSq^~6M%?Xj_q z=g19O2`*^ngqkyk8GOcb8*1)zf41<_AHIgd`8^rh#jEw8Hg2pn?L}yo+12=`1)3{} zQW&;Tk72esh+-xj-z<$D#$g83;^eN2x>{+YZ0 zsJiM_<{#TF#jiHXOr^*Ms}~0DP)lOBXyczB_ehQtybNem11;^3qcJ_^janvQ+Wu7l8E>45jju!30_fdVx~rQ@)+0S(*E@j=+93#e z;|lamAw6MwXDItO&mY0xEnQ!JPy~6K1~e{oLZSEJ!ld}v<3BT8EyEG(7Ba~pTb9R| z_nrR&aD7ROQFxc1NRD3&r_^wuS8FdM!_q>pGlIG6Mjyw;*pkt7K^xNP-$NDzO|!)k zpw4-m%2JZMac0aPGpKdc$a6L9PHvfv1fpK#{F}Wp`6reQG0ff>She&=+Yr+t*iLk! zq{B|0i>7sS9VT*9BNbhl^Ds0pFH)R|h`y>S9;S|2dU#JC%TI&TH0aN0;hN|4bmjGL z_g|X#>6dTb(`bCza}DpPV9(~CJS&IK>mhkZUvg^AxM64tm1Ll5vtnnUH2q%#r8co73gwh{bn*Ei+zM*!);ci{kaLotp+?JI!vMJu8n*Lxg2+)WkRWlACJT zu1Jl6>>$&$_;#bR+ORI1Ggl5H`NrYukcoD~siM~2GJkYwsC4Ro1F*6k4`+&&Xt`~5 zIsW91qxE;L^@thCz+zrdKSG{wW;QpbWsY9xV_mH)S~9*mhCAm-uWva*3er~0!_H>S zHfR~_I*%CVzsbb8sywIjxHjjR%B=Z+Ssh#<9=0gfdoi0vAdS#P{cs`BP*QqcmCxSk zLN!e~AE}tk1ip5oc1;)mSaqPC#Y8NO8NODdPtu zC!WMAz0GaUAim1$rOpH^{h8M$d#tI}TC}c2X(W?X=K@jliy_9Y%8L!6nPQYx(A+g3{j(2)7e`%J!SctXpI4xS;< zT~&B)#VyN|Jv8E_sdRF-9u@-vC!L-kc5?TpmdU*knFfiz5>3GNf4p>a0lwsyKa$81{#qQn^OH_7q7c4`co>kwMZyJ5Dp0r&Tq z*+YA2P~7^u<_;AN(x3a>q6erl@R1CQJ%?lhLOhSS#fIg3mw8n5V%Vd=^9IRpDy~2R zZY6oiD!&w(kAfe<8(X77GPTW>)&;gjZcAH0C5hitM})%~rF`(;NewQN5F}GG3LWUy z($W)@@tG{nH^R_34OjFGFxh}K1SSKCJ`OJG^4ERiWIo&Hd(H?ZDZ=$G=h>jtR4QRj z{4w4JgpvOXQ@esvuDj9k{aS2>B~@xaGfZFMC?WluzndiasY*$}=}2L;9R-R5+D*BP zL0og@dxV7Kg9Uw6V#ecfMnvGz#6J%>JdXD|65in3$*wG1Lb-p^>LoK>N?q8|Gcp!` zZGWJ<5U{QJhu`)IqLqglPuND+g^OvXlXxqCsvoVjw{&!z5TYfH?tcx@cu3`_5@kHd zg=DOu=bN*Wq&B(?TIZ&M^AStO*BGeonVlttH!$0(%M4CYoZ%?16xOyI+$ zXY?@$1;of}K8ABVai8Lv9O|o~N`X1fVItF;T$0Y>6|+y>P$O?5n*KkztQi!l9sYp z1T{}mwru>YBobQRQz-nt&)c*OK@_}!;}{c|I7P)Mu4PH4yzny(=&jW9fIMUxl_Zy5 z`=1s->YS35Ai1dcUX8fz__P`1<%5u+lZ(1@x}t#eg`j`lEc(~c`t z{i{;C95Y@6ucD%2gRFftmbkGdviWjD);+ JwWvYB{{TFGMYsR} literal 0 HcmV?d00001 diff --git a/deployment/zip/src/main/release/bin/oclip.sh b/deployment/zip/src/main/release/bin/oclip.sh index e4a58502..a3d51940 100755 --- a/deployment/zip/src/main/release/bin/oclip.sh +++ b/deployment/zip/src/main/release/bin/oclip.sh @@ -18,7 +18,7 @@ if [ -z "$OPEN_CLI_HOME" ] then - echo "There is no OPEN_CLI_HOME" + echo "OPEN_CLI_HOME is not set." exit 1 fi diff --git a/docs/cmd_help.rst b/docs/cmd_help.rst index 3b6f5a7e..e8e4fcad 100644 --- a/docs/cmd_help.rst +++ b/docs/cmd_help.rst @@ -375,10 +375,10 @@ Results:: -x | --vsp-id Onap VSP ID. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -430,10 +430,10 @@ where:: -y | --vlm-version VLM version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -493,10 +493,10 @@ where:: optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -577,10 +577,10 @@ where:: 0f4899c3-771c-462e-9dc8-ffa2de5532f6. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -647,10 +647,10 @@ where:: adbbea15-de1a-442a-a0e3-793779ea25bb. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -702,10 +702,10 @@ where:: -y | --vlm-version License Model version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -836,10 +836,10 @@ Results:: 93230cdb-aae3-4b87-a38a-fc4529e8aac9. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -892,10 +892,10 @@ where:: STRING. It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -948,7 +948,12 @@ Options:: where:: +<<<<<<< ece4fcf67742a307d5d68fbde1723f3e0485b7fb -x | --name Entitlement Pool name. It is of type STRING. +======= +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed + -x | --name Feature group name. It is of type STRING. +>>>>>>> Normalize all env with OPEN_CLI -y | --vlm-id License Model ID. It is of type STRING. -e | --vlm-version License Model version. It is of type STRING. -z | --description Description for Entitlement Pool. It is of type @@ -980,6 +985,32 @@ where:: BOOL. By default, it is false. -a | --no-auth whether to authenticate user or not. It is of type BOOL. By default, it is false. +======= + -u | --onap-username Onap user name. It is of type STRING. By default, + it is read from environment variable + OPEN_CLI_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + OPEN_CLI_PASSWORD. Secured. + -m | --host-url Onap host url. It is of type URL. By default, it + is read from environment variable OPEN_HOST_URL. + -h | --help Onap command help message. It is of type STRING. + By default, it is false. + -v | --version Onap command service version. It is of type + STRING. By default, it is false. + -d | --debug Enable debug output. It is of type BOOL. By + default, it is false. + -f | --format Output formats, supported formats such as table, + csv, json, yaml. It is of type STRING. By + default, it is table. + -s | --long whether to print all attributes or only short + attributes. It is of type BOOL. By default, it is + false. + -t | --no-title whether to print title or not. It is of type + BOOL. By default, it is false. + -a | --no-auth whether to authenticate user or not. It is of + type BOOL. By default, it is false. +>>>>>>> Normalize all env with OPEN_CLI Results:: @@ -1016,10 +1047,10 @@ where:: -y | --vsp-version VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1168,10 +1199,10 @@ Results:: It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1247,10 +1278,10 @@ where:: It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1302,10 +1333,10 @@ where:: -y | --vsp-version Onap VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1441,10 +1472,10 @@ where:: 3def24ae-701e-4c98-91a6-859c0f206759. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1527,10 +1558,10 @@ Results:: 7b301a17-5eb2-413b-b214-fd1659fdf049. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1584,10 +1615,10 @@ where:: -z | --vsp-file CSAR File path. It is of type BINARY. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1644,10 +1675,10 @@ where:: -e | --service-type Onap service type. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1696,10 +1727,10 @@ where:: >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1749,10 +1780,10 @@ where:: -y | --vsp-version VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1802,10 +1833,10 @@ where:: -y | --vsp-version VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1899,10 +1930,10 @@ where:: ======= -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -1958,10 +1989,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2029,10 +2060,10 @@ where:: It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2101,10 +2132,10 @@ where:: >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2182,10 +2213,10 @@ where:: -y | --vsp-version VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2235,10 +2266,10 @@ where:: -y | --vsp-version Onap VSP version. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2344,10 +2375,10 @@ where:: It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ @@ -2400,10 +2431,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2464,10 +2495,10 @@ where:: optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2552,10 +2583,10 @@ where:: -x | --customer-name Onap customer name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2651,10 +2682,10 @@ where:: -r | --tenant-name Onap cloud tenant name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2724,10 +2755,10 @@ where:: STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2790,10 +2821,10 @@ where:: >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -2845,6 +2876,7 @@ Options:: where:: +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed <<<<<<< 08468db7c00dd0594d6846c4c761f0582be9fc06 -b | --service-model-id Service model ID. It is of type STRING. It is optional. @@ -2873,6 +2905,8 @@ where:: -a | --no-auth whether to authenticate user or not. It is of type BOOL. By default, it is false. ======= +======= +>>>>>>> Normalize all env with OPEN_CLI -x | --vnf-instace-id id for vnf. It is of type STRING. -y | --service-instace-id unique id for service instance. It is of type STRING. @@ -2881,10 +2915,17 @@ where:: -z | --tenant-id openstack tenant id (uuid). It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed OPEN_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable OPEN_PASSWORD. Secured. +======= + OPEN_CLI_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + OPEN_CLI_PASSWORD. Secured. +>>>>>>> Normalize all env with OPEN_CLI -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3084,10 +3125,10 @@ Results:: false. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3303,10 +3344,10 @@ where:: -z | --tenant-id openstack tenant id (uuid). It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3398,10 +3439,10 @@ where:: -i | --instance-name service instance name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3485,10 +3526,10 @@ where:: STRING. It is optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3656,10 +3697,10 @@ where:: -null | --feature-group-id Feature Group ID. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -3765,10 +3806,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7348,6 +7389,7 @@ Options:: where:: +<<<<<<< ece4fcf67742a307d5d68fbde1723f3e0485b7fb -x | --ep-name Entitlement Pool name. It is of type STRING. -y | --license-model-id License Model ID. It is of type STRING. -z | --ep-description Description for Entitlement Pool. It is of type @@ -7382,10 +7424,127 @@ where:: BOOL. By default, it is false. -a | --no-auth whether to authenticate user or not. It is of type BOOL. By default, it is false. +======= + -x | --group-name group name. It is of type STRING. + -y | --license-model-id License Model ID. It is of type STRING. + -z | --license-group-description Description for License Group. It is of type + STRING. It is optional. + -u | --onap-username Onap user name. It is of type STRING. By default, + it is read from environment variable + ONAP_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + ONAP_PASSWORD. Secured. + -m | --host-url Onap host url. It is of type URL. By default, it + is read from environment variable ONAP_HOST_URL. + -h | --help Onap command help message. It is of type STRING. + By default, it is false. + -v | --version Onap command service version. It is of type + STRING. By default, it is false. + -d | --debug Enable debug output. It is of type BOOL. By + default, it is false. + -f | --format Output formats, supported formats such as table, + csv, json, yaml. It is of type STRING. By + default, it is table. + -s | --long whether to print all attributes or only short + attributes. It is of type BOOL. By default, it is + false. + -t | --no-title whether to print title or not. It is of type + BOOL. By default, it is false. + -a | --no-auth whether to authenticate user or not. It is of + type BOOL. By default, it is false. Results:: + ID License Group ID and is of type STRING. + + +Error:: + + On error, it prints :::: + + + +[10] license-group-show +----------------------------------------------- + + +usage: onap license-group-show + +Details of the License Group + +Onap service: sdc v1.0 + +Options:: + + [-x | --license-model-id] [-y | --license-group-id] [-u | --onap-username] + [-p | --onap-password] [-m | --host-url] [-h | --help] + [-v | --version] [-d | --debug] [-f | --format] + [-s | --long] [-t | --no-title] [-a | --no-auth] + +where:: + +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed + -x | --license-model-id Onap License Model ID. It is of type STRING. + -y | --license-group-id Onap License Group ID. It is of type STRING. + -u | --onap-username Onap user name. It is of type STRING. By default, + it is read from environment variable + ONAP_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + ONAP_PASSWORD. Secured. + -m | --host-url Onap host url. It is of type URL. By default, it + is read from environment variable ONAP_HOST_URL. + -h | --help Onap command help message. It is of type STRING. + By default, it is false. + -v | --version Onap command service version. It is of type + STRING. By default, it is false. + -d | --debug Enable debug output. It is of type BOOL. By + default, it is false. + -f | --format Output formats, supported formats such as table, + csv, json, yaml. It is of type STRING. By + default, it is table. + -s | --long whether to print all attributes or only short + attributes. It is of type BOOL. By default, it is + false. + -t | --no-title whether to print title or not. It is of type + BOOL. By default, it is false. + -a | --no-auth whether to authenticate user or not. It is of + type BOOL. By default, it is false. +======= + -x | --vsp-id Onap VSP ID. It is of type STRING. + -u | --onap-username Onap user name. It is of type STRING. By default, + it is read from environment variable + OPEN_CLI_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + OPEN_CLI_PASSWORD. Secured. + -m | --host-url Onap host url. It is of type URL. By default, it + is read from environment variable OPEN_HOST_URL. + -h | --help Onap command help message. It is of type STRING. + By default, it is false. + -v | --version Onap command service version. It is of type + STRING. By default, it is false. + -d | --debug Enable debug output. It is of type BOOL. By + default, it is false. + -f | --format Output formats, supported formats such as table, + csv, json, yaml. It is of type STRING. By + default, it is table. + -s | --long whether to print all attributes or only short + attributes. It is of type BOOL. By default, it is + false. + -t | --no-title whether to print title or not. It is of type + BOOL. By default, it is false. + -a | --no-auth whether to authenticate user or not. It is of + type BOOL. By default, it is false. +>>>>>>> Normalize all env with OPEN_CLI +>>>>>>> Normalize all env with OPEN_CLI + + +Results:: + +<<<<<<< ece4fcf67742a307d5d68fbde1723f3e0485b7fb <<<<<<< ab8942a839cc04dc8df1bf9cb19f375757f848b7 ID Entitlement Pool ID and is of type STRING. ======= @@ -7400,6 +7559,51 @@ Results:: -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable OPEN_PASSWORD. Secured. +======= +<<<<<<< 476f5637ae4e816f7abf3536c5eeb156e0af6bed + name License Group Name and is of type STRING. + ID License Group ID and is of type STRING. + description Description for the License Group and is of type + STRING. +======= + name VSP Name and is of type STRING. + ID VSP ID and is of type STRING. + description Description for the VSP and is of type STRING. + + +Error:: + + On error, it prints :::: + + + +vsp-submit +----------------------------------------------- + + +usage: onap vsp-submit + +Submit Vendor Software Product + +Onap service: sdc v1.0 + +Options:: + + [-x | --vsp-id] [-u | --onap-username] [-p | --onap-password] + [-m | --host-url] [-h | --help] [-v | --version] + [-d | --debug] [-f | --format] [-s | --long] + [-t | --no-title] [-a | --no-auth] + +where:: + + -x | --vsp-id Onap VSP ID. It is of type STRING. + -u | --onap-username Onap user name. It is of type STRING. By default, + it is read from environment variable + OPEN_CLI_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + OPEN_CLI_PASSWORD. Secured. +>>>>>>> Normalize all env with OPEN_CLI -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7418,8 +7622,12 @@ Results:: BOOL. By default, it is false. -a | --no-auth whether to authenticate user or not. It is of type BOOL. By default, it is false. +<<<<<<< ece4fcf67742a307d5d68fbde1723f3e0485b7fb >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ >>>>>>> Migrate docs to use OPEN_ instead of ONAP_ +======= +>>>>>>> Normalize all env with OPEN_CLI +>>>>>>> Normalize all env with OPEN_CLI Error:: @@ -7450,10 +7658,17 @@ where:: -x | --customer-name Onap customer name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable +<<<<<<< ece4fcf67742a307d5d68fbde1723f3e0485b7fb ONAP_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable ONAP_PASSWORD. Secured. +======= + OPEN_CLI_USERNAME. + -p | --onap-password Onap user password. It is of type STRING. By + default, it is read from environment variable + OPEN_CLI_PASSWORD. Secured. +>>>>>>> Normalize all env with OPEN_CLI -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable ONAP_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7519,10 +7734,10 @@ where:: optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7631,10 +7846,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7693,10 +7908,10 @@ where:: 6dc30068-de3c-483a-a9a8-7d483a39425d. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7746,10 +7961,10 @@ where:: -y | --subscriber-name Onap subscriber name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7800,10 +8015,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7859,10 +8074,10 @@ where:: -x | --customer-name Onap customer name. It is of type STRING. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7917,10 +8132,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -7981,10 +8196,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -8048,10 +8263,10 @@ where:: eb4a0d54-0e29-4174-8a3c-2c98e904a5f6. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -8105,10 +8320,10 @@ where:: b06576ca-74b8-42f2-815b-6f7b80f9941c. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -8156,10 +8371,10 @@ where:: -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. @@ -8231,10 +8446,10 @@ where:: optional. -u | --onap-username Onap user name. It is of type STRING. By default, it is read from environment variable - OPEN_USERNAME. + OPEN_CLI_USERNAME. -p | --onap-password Onap user password. It is of type STRING. By default, it is read from environment variable - OPEN_PASSWORD. Secured. + OPEN_CLI_PASSWORD. Secured. -m | --host-url Onap host url. It is of type URL. By default, it is read from environment variable OPEN_HOST_URL. -h | --help Onap command help message. It is of type STRING. diff --git a/docs/open_cli_schema_version_1_0.rst b/docs/open_cli_schema_version_1_0.rst index 42053730..8b365861 100644 --- a/docs/open_cli_schema_version_1_0.rst +++ b/docs/open_cli_schema_version_1_0.rst @@ -485,7 +485,7 @@ name: host-username long_option: host-username - default_value: ${HOST_USERNAME} + default_value: ${OPEN_CLI_HOST_USERNAME} is_optional: false @@ -500,7 +500,7 @@ name: host-password long_option: host-password - default_value: ${HOST_PASSWORD} + default_value: ${OPEN_CLI_HOST_PASSWORD} is_secured: true @@ -518,7 +518,7 @@ name: host-url is_optional: false - default_value: ${HOST_URL} + default_value: ${OPEN_CLI_HOST_URL} name: help ~~~~~~~~~~ diff --git a/docs/user_guide.rst b/docs/user_guide.rst index 64554682..b82dd16b 100644 --- a/docs/user_guide.rst +++ b/docs/user_guide.rst @@ -13,8 +13,8 @@ Provides unified commands to operate ONAP from Linux console. Configure the following environment variables, before using it: 1. **OPEN_HOST_URL** - Onap Micro service bus(MSB) URL or a service URL -2. **OPEN_USERNAME** - Onap user name -3. **OPEN_PASSWORD** - Onap user password +2. **OPEN_CLI_USERNAME** - Onap user name +3. **OPEN_CLI_PASSWORD** - Onap user password To Run a command ----------------- diff --git a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java index 2f970b5f..f3b949f1 100644 --- a/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java +++ b/framework/src/main/java/org/onap/cli/fw/error/OnapCommandProductVersionInvalid.java @@ -19,7 +19,7 @@ package org.onap.cli.fw.error; import java.util.Set; /* - * ONAP command product version is invalid + * Open CLI command product version is invalid * */ public class OnapCommandProductVersionInvalid extends OnapCommandException { diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java index 7baae094..bcb404fe 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java @@ -1062,8 +1062,8 @@ public class OnapCommandUtils { * help failed exception */ public static String help(OnapCommand cmd) throws OnapCommandHelpFailed { - //mrkanag refactor onap name into oclip - String help = "usage: onap " + cmd.getName(); + + String help = "usage: oclip " + cmd.getName(); // Add description help += "\n\n" + cmd.getDescription(); diff --git a/framework/src/main/resources/default_input_parameters_http.yaml b/framework/src/main/resources/default_input_parameters_http.yaml index 529053d0..81656ea0 100644 --- a/framework/src/main/resources/default_input_parameters_http.yaml +++ b/framework/src/main/resources/default_input_parameters_http.yaml @@ -5,14 +5,14 @@ parameters: description: Host user name short_option: u long_option: host-username - default_value: $s{env:HOST_USERNAME} + default_value: $s{env:OPEN_CLI_HOST_USERNAME} is_optional: false - name: host-password type: string description: Host user password short_option: p long_option: host-password - default_value: $s{env:HOST_PASSWORD} + default_value: $s{env:OPEN_CLI_HOST_PASSWORD} is_secured: true is_optional: false - name: host-url @@ -21,7 +21,7 @@ parameters: short_option: m long_option: host-url is_optional: false - default_value: $s{env:HOST_URL} + default_value: $s{env:OPEN_CLI_HOST_URL} - name: no-auth type: bool description: whether to authenticate user or not diff --git a/framework/src/test/resources/sample-cmd-test-help.txt b/framework/src/test/resources/sample-cmd-test-help.txt index 2523ce9b..fd36587d 100644 --- a/framework/src/test/resources/sample-cmd-test-help.txt +++ b/framework/src/test/resources/sample-cmd-test-help.txt @@ -1,4 +1,4 @@ -usage: onap sample-test +usage: oclip sample-test Onap sample command to test the command features diff --git a/main/src/main/resources/onap-readme.txt b/main/src/main/resources/onap-readme.txt index 39990700..ab4086b5 100644 --- a/main/src/main/resources/onap-readme.txt +++ b/main/src/main/resources/onap-readme.txt @@ -1,22 +1,22 @@ OPEN Command-line interface (CLI) ================================== - _____ _____ _ _____ + _____ _____ _ _____ | _ | / __ \| | |_ _| -| | | |_ __ ___ _ __ | / \/| | | | -| | | | '_ \ / _ \ '_ \ | | | | | | -\ \_/ / |_) | __/ | | | | \__/\| |_____| |_ - \___/| .__/ \___|_| |_| \____/\_____/\___/ - | | - |_| - +| | | |_ __ ___ _ __ | / \/| | | | +| | | | '_ \ / _ \ '_ \ | | | | | | +\ \_/ / |_) | __/ | | | | \__/\| |_____| |_ + \___/| .__/ \___|_| |_| \____/\_____/\___/ + | | + |_| + Provides unified commands to operate any cloud enabled software products from Linux/Web console. Configure the following environment variables, before using it: -1. HOST_URL - Catalog service URL or a service URL -2. HOST_USERNAME - Service user name -3. HOST_PASSWORD - Service password +1. OPEN_CLI_HOST_URL - Catalog service URL or a service URL +2. OPEN_CLI_HOST_USERNAME - Service user name +3. OPEN_CLI_HOST_PASSWORD - Service password To know the CLI version, type onap [-v|--version] To know the CLI usage, type onap [-h|--help] -- 2.16.6