Merge "Issue ID:GSO-83" into sun

Issue ID:GSO-83

Change-Id: I1d607d0e95cfa9ff55726a8054b6c096d3c3adea
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "Fix the bug "Can not show package detail", remove the modeldsigner child menu." into sun

Merge "fix issue:GSO-87" into sun

Fix the bug "Can not show package detail", remove the modeldsigner child menu.

Change-Id: I6d9231db6e0d8458c33a228861a441ea27707ba5
Issue-id:GSO-86
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

fix issue:GSO-87

Change-Id: I9688b3670c2f89e955d0c212859ea8ce06442280
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

Merge "GSO-75 GSO-76" into sun

Fix Issue-Id: GSO-81

Change-Id: I33c400bb7f67568616fc5d797319a41798c68c75
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

GSO-75
GSO-76

Change-Id: I2f919d14da304e0b14546d83e0e6e61f2859cf68
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

Merge "Fix Issue-Id: GSO-84" into sun

Fix Issue-Id: GSO-84

Change-Id: Ib786f58335f7f6700cc435c5ac6030d347f0f71d
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

add SDN controller page to main menu list

add SDN controller page to main menu list

SDNO-805

Signed-off-by: openo-lihua <uranus.lihua@huawei.com>
Change-Id: Ibafb87b835fc7fc1307a71312bac17ad7656920d

Merge "Issue ID:GSO-83" into sun

Issue ID:GSO-83

Change-Id: I0bc49849255bc2c2c702cc261f2f86b1a967fb12
Signed-off-by: j00302280 <j00101220@huawei.com>

fix controller creation bug
type field have the wrong id so caused json parse error
SDNO-805

Change-Id: Id59310c86b4c4a060a4b6bea8f86b51661a7f00e
Signed-off-by: yuhao10 <yuhao10@huawei.com>
(cherry picked from commit 65e82f6a552ee2795ee3bc5975ec7a0e2b0558c8)

set version type field in controller.html
set type version field as required
change type from select to input
SDNO-805

Change-Id: Ia7e9288440855abf233a4e05b10d66a777be4ae6
Signed-off-by: yuhao10 <yuhao10@huawei.com>
(cherry picked from commit 90341c19295b8e66d5aee28ca13c67e22de670e1)

fix all bug in sdno resource page and controller page.

delete all the idea configuration files in source code.
rewrite the storage and query function in controller page.
fix wrong logic in ne, link, port, site page and brs.js.

SDNO-805

Change-Id: I2fdecc186a5790a9b27c4cade8aa78c3d1575f6e
Signed-off-by: yuhao10 <yuhao10@huawei.com>
(cherry picked from commit 2b340a445aa07d38fcbd2eff8d7cdb6c3d7cf518)

Fix Issue#GSO-71

Change-Id: Ica2dfc386b6170f8678f24ef3ff20efef3918267
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 34766df33b206e306365284193dd6d12aa3e2b44)

Merge "Fix the alert message while onboard package." into sun

Merge "Fix the bug "delete package, package table would not be refreshed"." into sun

Fix the alert message while onboard package.

Change-Id: Iaf8494f32ed05764faad5ba77a56876729727b98
Issue-id:GSO-66
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Fix the bug "delete package, package table would not be refreshed".

Change-Id: Ia2311b7e5e0ecc0f072ab03d064a55764a60d886
Issue-id:GSO-50
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Fix Issue#GSO-54

Change-Id: Icd833b57dfa9354c3211cd26fdf4b4a16cd4f223
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

GSO-64

Change-Id: I3ae3efbe2729aa8a657b15628b45eacdc1568918
Signed-off-by: “shentao” <shentao@chinamobile.com>

Merge "Readd "Orchestrator" menu, and it's submenu." into sun

Readd "Orchestrator" menu, and it's submenu.

Change-Id: I85623a372652a211155fe5e68409e97247964314
Issue-id:GSO-14
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Fix Issue#GSO-63

Change-Id: I7ebe25e26b6384482b6444c6e6272260131dee8b
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 320b831367c168e0067ba58b765d709020fee64e)

Merge "fix issue:GSO-54" into sun

Merge "Issue#GSO-58 Fix the wrong nvfo uri" into sun

Fix Issue#GSO-54

Change-Id: I5e2f73810dd3e1aa47b46b487a4894a1d98129ef
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

Issue#GSO-58 Fix the wrong nvfo uri

Change-Id: I703278a71f0c0af0b59c9b34fc07f64d565e1181
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit b0cc467e43749aadbe2941f2fb851c38d3021882)

fix issue:GSO-54

Change-Id: I6f0796962a5ba3ebf831e7461e5df92b52f51224
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

Issue#GSO-53 Support to config location per nesting nfvo service template.

Change-Id: Ibb6dc67b1c59bd493a0ed2b473ff93e3c5de8540
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 44e4d940b2c5ca753a74491e94fa3f703014d5ec)

Issue ID: GSO-60

Change-Id: I21a3cc86c326487f0c7df82616a66a00458334ca
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "Fix the data transmit to NFVO" into sun

Merge "Issue#GSO-46 Fix method name error and url error." into sun

Merge "Issue#GSO-51 fix request body error" into sun

Issue#GSO-52 Fix gsolcm uri

Change-Id: Ifd250ac75b60daf6de19b8d8729173bd0310692d
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 37dbaf820fe9f7d196e405167dc90d2f344604eb)

Issue#GSO-47 Fix the wrong url for sdno lcm service

Change-Id: I2b017e78b1f3c62e54d4431baf025a5049b905f2
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 118ef7f971ec183462c65c89969d9ac6b389423d)

Issue#GSO-51 fix request body error

Change-Id: I1cbd15aed2930dc17982f13d326fe1a17addac13
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 468dd87b92a9f7d811fcf4c177dfde13bdc22089)

Issue#GSO-46 Fix method name error and url error.

Change-Id: I3a745ac09d4980a33e9093f18e10316c099db35f
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit b7299a3f95b764eefd08c059efce06a0dc7675f5)

Issue#GSO-47 Fix the wrong url for sdno lcm service

Change-Id: I82cb19a6b8c7aabf11912c6211e2bbd97371b510
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 31cd057877b061e4a18354abba94aa42a0a002a7)

Merge "Issue#GSO-46 Add nesting service template parameters to config for GSO service" into sun

Fix the data transmit to NFVO

Change-Id: Ibd8cac18b07af5368d5beb64abf8e2168dde4f72
Issue-id:GSO-49
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Merge "Remove unnecessary URL prefix "org.openo.sdno.brs" when portal calls BRS that is running in a docker [ SDNO-750 ]" into sun

Issue#GSO-46 Add nesting service template parameters to config for GSO service

Change-Id: If853766873fb4e79d1d3fa562a93bca998233f91
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit eed792fbd8c41f270de8a377005eaa8fff1908d4)

delete nfvo resource btn
NFVO-38

Change-Id: I1928c13fa61cfb9d3bf4ae4c8afd001cc6b0d773
Signed-off-by: Quan-Zhong <quanzhong@huawei.com>

Merge "when the service is down . the web page should render . and display an empty table." into sun

Merge "Change the realization of package table, fix the bug GSO-40" into sun

Merge "Issue#GSO-30 Show empty string while no default value defination in response body." into sun

Issue#GSO-44 Modify to get servceId from response for creating service.

Change-Id: I97a513b67e0c553e84eb88ceecabf7d9573e4339
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit cade354c0d377bbb03eaea62edccb0a7d34488c3)

Change the realization of package table, fix the bug GSO-40

Change-Id: Ie05b630cd3cd091c5604641a75ad1956a77c3467
Issue-id:GSO-40
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

when the service is down . the web page should render . and display an empty table.

https://jira.open-o.org/browse/OCS-125

Change-Id: I96133c618ebe5e38fa38dda5d5b16b30f303c866
Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>

Remove unnecessary URL prefix "org.openo.sdno.brs" when portal calls BRS
that is running in a docker [ SDNO-750 ]

Change-Id: I1dda47c089098c8039a306ef30da376a54a8c3d8
Signed-off-by: Xiuchao Wu <xiuchao.wu@huawei.com>

Merge "Issue ID: GSO-43" into sun

Issue ID: GSO-43

Change-Id: I5abea29a9ec06d28d8aabb927cb29e95eaf6ea49
Signed-off-by: j00302280 <j00101220@huawei.com>

Issue#GSO-30 Show empty string while no default value defination in response body.

Change-Id: If02b8ffbdddbd63d5eccae0f31ac2aa655318a68
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit a48605e7984d9488f1bfa4b333bc4fd011914902)

GSO-34 Fix unmarshal json error.

Change-Id: Ife9941fbb9f765673edd22613d41603a7d11060a
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit aa290444e456ebfc7b8cf48ea344e17c17105a0a)

Merge "GSO-26 Modify the response structure for deleting service to be consistent with the api." into sun

Merge "Issue ID: GSO-38" into sun

Issue ID: GSO-38

Change-Id: Ie7527ff941cb8e6a00d854f6ab64357a87d51a76
Signed-off-by: j00302280 <j00101220@huawei.com>

Issue ID: GSO-37

Change-Id: I376471bf15f5c090d8e574e13524d736011a7a3e
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "MODIFIED CONFG FILES NFVO-32" into sun

GSO-26 Modify the response structure for deleting service to be consistent with the api.

Change-Id: Ic6a4fa300e914be8bb6016e5022d548940fed29e
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit 5b70f275529dc33fb3cd01d046b5fd21cd4b66da)

Merge "Add the alert about delete package." into sun

Merge changes Id6024a0a,If5b05fbe into sun

* changes:
  Fix onboard and delete package url, onboard SSAR package calls catalog API.
  Fix the bug "A message showed in a wrong time when upload package." and modify the css of select vim dialog.

Merge "Remove the unused i18n fields. Issue-id:GSO-10" into sun

Add the alert about delete package.

Change-Id: I24cd8aa136d78c62422d0c973bf4490759c102c7
Issue-id: GSO-32
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Fix onboard and delete package url, onboard SSAR package calls catalog API.

Change-Id: Id6024a0a39b716931d0c8ad91d87920625289592
Issue-id:GSO-28 GSO-29
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Remove the unused i18n fields.
Issue-id:GSO-10

Change-Id: I1aefd646546bf074c0ca976831295a69ba4c97b2
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

Fix the bug "A message showed in a wrong time when upload package." and modify the css of select vim dialog.

Change-Id: If5b05fbef0eedf496e50c37245826af422885693
Issue-id:GSO-18
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

MODIFIED CONFG FILES
NFVO-32

Change-Id: I4bc420b8ed10b481bb4f5a319b76e0f00e95eca0
Signed-off-by: Quan-Zhong <quanzhong@huawei.com>

GSO-26 Fix the wrong url sent to service gateway. Modify the codes for deleting service to be consistent with the api.

Change-Id: If9242f8c956d5e93f49c4359a959343ed34cfefb
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
(cherry picked from commit cddbebf090d52a234e536bef5f7e6dbd6ddcc9e0)

Merge "meger nfvo's resource.html to sdno's NFVO-22" into sun

Merge "integration with CMCC portal." into sun

meger nfvo's resource.html to sdno's
NFVO-22

Change-Id: Ide60f3562985d3e55ef421d68d2865526d8df5d8
Signed-off-by: Quan-Zhong <quanzhong@huawei.com>

Issue ID:GSO-21

Change-Id: Ie36e036016418186e8170d2016e04abde54007ce
Signed-off-by: j00302280 <j00101220@huawei.com>

Issue ID:GSO-21

Change-Id: Iae71bb72a829e0212f45fec9eb532e26f1a02a7f
Signed-off-by: j00302280 <j00101220@huawei.com>

integration with CMCC portal.

1. change the import js and css path into the right one ;

OCS-113" target="_blank">https://jira.open-o.org/browse/OCS-113

Change-Id: Iac4b94f556e38cf15bfd6582efb7125111c9af47
Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>

Rollback the GSO-13

Change-Id: I3426576b63f8523ea1d775fccc8ad0382d0f4a5d
Signed-off-by: j00302280 <j00101220@huawei.com>

For the bug GSO-13

Change-Id: I64329253e6f9f677d421fe47b7575d0c6911f194
Signed-off-by: j00302280 <j00101220@huawei.com>

modify frame page

Change-Id: I0c4bfab53365c7b70c23c8ff4a2bafef6a33e2ac
Signed-off-by: “shentao” <shentao@chinamobile.com>

Merge "SDNO-577"

Merge "UI Portal changes GSO-12"

SDNO-577

Change-Id: I2b11d6465efe74fc7b744e44f238670c7995c8b1
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

UI Portal changes GSO-12

Change-Id: Ib72a9c6576acd5786fa01ac049b629fe5ee489ee
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

For the bug GSO-11

Change-Id: Ic169b9084023ef11eea7ca352ef2083f195faa83
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "Resolve the Bug GSO-9 for add new files"

Resolve the Bug GSO-9 for add new files

Change-Id: Id076b732cd4ed68ff47805e90031021193e7162b
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "Resolve the Bug GSO-9"

Resolve the Bug GSO-9

Change-Id: I1cbbc996ce1a43159073d02c8ebb733cfc7d8d54
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "Resolve the Bug GSO-8"

Resolve the Bug GSO-8

Change-Id: I65bed2e965d03230782920d0a16542e40a37cdc2
Signed-off-by: j00302280 <j00101220@huawei.com>

Merge "modify main_page"

Merge "Add jquery.dataTables files of version 1.9.4 Issue-id:TOSCA-101"

Add jquery.dataTables files of version 1.9.4
Issue-id:TOSCA-101

Change-Id: Ib2e2bbf85308fb75d0e8cebe7469f643ad97e789
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

modify main_page

Change-Id: I7e80ff78534db0d5c1fcfc69b690858d76a7a924
Signed-off-by: “shentao” <shentao@chinamobile.com>

Merge "For the Jira bug GSO-6"

For the Jira bug GSO-6

Change-Id: I8eaa1322f5cf157f9b247a573d5345d4e003bd00
Signed-off-by: j00302280 <j00101220@huawei.com>

Dynamic config for the server IP and port

Change-Id: I40cacf0cff624411196760fa5d284f3bf9bc2ec2
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>