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>

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index c161141..ecc0b86 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -103,7 +103,7 @@
                                        <td ms-text="res.operationalState"></td>\r
                                        <td>\r
                                                <span class="label label-info status" data-toggle="tooltip" title="nfv-package-iui-status-tip"\r
-                                                         ms-click="vm.onBoardPackage(res.csarId,res.type)">\r
+                                                         ms-click="vm.onBoardPackage(res.csarId,res.type,res.onBoardState)">\r
                                                {{res.onBoardState}}\r
                                                </span>\r
                                        </td>\r
@@ -117,6 +117,26 @@
                                </tbody>\r
                        </table>\r
                </div>\r
+               <div class="row-fluid">\r
+                       <div class="col-md-12" style="padding-left:0px;">\r
+                               <div class="pull-left">\r
+                                       <small><label>\r
+                                               View\r
+                                               <select size="1" name="ict_template_table_length" aria-controls="ict_template_table">\r
+                                                       <option value="10" selected="selected">10</option>\r
+                                                       <option value="25">25</option>\r
+                                                       <option value="50">50</option>\r
+                                                       <option value="100">100</option>\r
+                                               </select>\r
+                                                records\r
+                                       </label>\r
+                                       <span id="com_zte_openo_umc_monitor_monitorList_total" name_i18n="com_zte_openo_umc_monitor_ui_i18n">Found total</span>\r
+                                               <span ms-text="vm.resource.packageInfo.size()"></span>\r
+                                               <span id="com_zte_openo_umc_monitor_monitorList_records" name_i18n="com_zte_openo_umc_monitor_ui_i18n">records</span>\r
+                                       </small>\r
+                               </div>\r
+                       </div>\r
+               </div>\r
                <div id="right-menu" ms-css-display="packageDetail.isShow">\r
                        <div>\r
                                <div class="title">\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
index 3b2cf39..5b34be2 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -84,6 +84,7 @@ nfv-package-iui-message-upload-csar-exist=There is a package in the same name, t
 nfv-package-iui-message-upload-csar-deletionpending=This package is referenced in an instance. whether to re upload?\r
 nfv-package-iui-message-onBoarded = Already onBoarded, no need for onBoarding.\r
 nfv-package-iui-message-onBoard-error = Onboarding error.\r
+nfv-package-iui-message-delete-error = Package delete error.\r
 nfv-package-iui-message-select-vim-error = Can not select more than one VIM to be test environment.\r
 nfv-package-iui-onboard-dialog-vimname = VIM Name\r
 nfv-package-iui-product-env = Product Environment\r
@@ -147,3 +148,6 @@ nfv-topology-iui-message-error=Query Topology Information failed.
 \r
 nfv-software-iui-action-delete=Delete\r
 nfv-software-iui-action-onboard=Onboard\r
+\r
+com_zte_openo_umc_monitor_monitorList_total=total\r
+com_zte_openo_umc_monitor_monitorList_records=records
\ No newline at end of file

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
index 478289f..616398b 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -85,6 +85,7 @@ nfv-package-iui-message-upload-csar-exist=包已经存在，是否重新上传
 nfv-package-iui-message-upload-csar-deletionpending=实例中引用了此包，是否重新上传？\r
 nfv-package-iui-message-onBoarded = 已经上载，无需再次上载。\r
 nfv-package-iui-message-onBoard-error = 上载失败。\r
+nfv-package-iui-message-delete-error = 包删除失败。\r
 nfv-package-iui-message-select-vim-error = 最多只能选择一个VIM做为测试环境\r
 nfv-package-iui-onboard-dialog-vimname = VIM名称\r
 nfv-package-iui-product-env = 生产环境\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
index 3170242..72d83df 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
@@ -21,16 +21,16 @@ var vm = avalon.define({
         vimSelectItems : []\r
     },\r
     csarIdSelected : "",\r
-       $packageTableFields : {// table columns\r
-               table: [\r
-            {"mData": "name", name: $.i18n.prop("nfv-package-iui-field-name")},\r
-            {"mData": "type", name: $.i18n.prop("nfv-package-iui-field-type")},\r
-            {"mData": "size", name: $.i18n.prop("nfv-package-iui-field-size")},\r
-            {"mData": "createTime", name: $.i18n.prop("nfv-package-iui-field-createTime")},\r
-            {"mData": "status", name: $.i18n.prop("nfv-package-iui-field-status"), "fnRender" : pmUtil.statusRender},\r
-            {"mData": null, name: $.i18n.prop("nfv-package-iui-field-operation"), "fnRender" : pmUtil.actionRender}\r
-               ]\r
-       },\r
+       //$packageTableFields : {// table columns\r
+       //      table: [\r
+     //       {"mData": "name", name: $.i18n.prop("nfv-package-iui-field-name")},\r
+     //       {"mData": "type", name: $.i18n.prop("nfv-package-iui-field-type")},\r
+     //       {"mData": "size", name: $.i18n.prop("nfv-package-iui-field-size")},\r
+     //       {"mData": "createTime", name: $.i18n.prop("nfv-package-iui-field-createTime")},\r
+     //       {"mData": "status", name: $.i18n.prop("nfv-package-iui-field-status"), "fnRender" : pmUtil.statusRender},\r
+     //       {"mData": null, name: $.i18n.prop("nfv-package-iui-field-operation"), "fnRender" : pmUtil.actionRender}\r
+       //      ]\r
+       //},\r
        $language: {\r
         "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"\r
                         +$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",\r
@@ -51,14 +51,14 @@ var vm = avalon.define({
     $restUrl:{\r
         queryPackageInfoUrl: "/openoapi/catalog/v1/csars",\r
         uploadPackageUrl: "/openoapi/catalog/v1/csars",\r
-        gsarDelPackageUrl: "/openoapi/gsolcm/v1.0/nspackage",\r
+        gsarDelPackageUrl: "/openoapi/gso/v1/nspackages",\r
         ssarDelPackageUrl: "/openoapi/catalog/v1/csars",\r
-        nsarDelPackageUrl: "/openoapi/nslcm/v1.0/nspackage",\r
-        nfarDelPackageUrl: "/openoapi/nslcm/v1.0/vnfpackage",\r
-        gsarOnboardUrl: "/openoapi/gsolcm/v1.0/nspackage",\r
-        ssarOnboardUrl: "/openoapi/nslcm/v1.0/nspackage",\r
-        nsarOnboardUrl: "/openoapi/nslcm/v1.0/nspackage",\r
-        nfarOnboardUrl: "/openoapi/nslcm/v1.0/vnfpackage",\r
+        nsarDelPackageUrl: "/openoapi/nslcm/v1/nspackage",\r
+        nfarDelPackageUrl: "/openoapi/nslcm/v1/vnfpackage",\r
+        gsarOnboardUrl: "/openoapi/gso/v1/nspackages",\r
+        ssarOnboardUrl: "/openoapi/catalog/v1/csars",\r
+        nsarOnboardUrl: "/openoapi/nslcm/v1/nspackage",\r
+        nfarOnboardUrl: "/openoapi/nslcm/v1/vnfpackage",\r
         changePackageStatusUrl : "/openoapi/catalog/v1/csars",\r
         queryVimInfoUrl : "/openoapi/extsys/v1/vims"\r
     },\r
@@ -130,11 +130,6 @@ var vm = avalon.define({
             labVimId : "",\r
         },\r
         $initData : function(csarId) {\r
-            //vm.resource.vimSelectItems = [\r
-            //    {vimName:"test1", oid:"123456"},\r
-            //    {vimName:"test2", oid:"987654"},\r
-            //    {vimName:"test3", oid:"123qwe"}\r
-            //];\r
             var url=vm.$restUrl.queryVimInfoUrl;\r
             commonUtil.get(url,null,function(resp) {\r
                 if (resp) {\r
@@ -189,28 +184,14 @@ var vm = avalon.define({
             if(result) {\r
                 if(type == "NSAR") {\r
                     url = vm.$restUrl.nsarDelPackageUrl + "/" + csarId;\r
-                    //commonUtil.delete(url, function(resp) {\r
-                    //    vm.gotoPackageListPage();\r
-                    //});\r
                 } else if(type == "NFAR") {\r
                     url = vm.$restUrl.nfarDelPackageUrl + "/" + csarId;\r
-                    //commonUtil.delete(url, function(resp) {\r
-                    //    vm.gotoPackageListPage();\r
-                    //});\r
                 } else if(type == "GSAR") {\r
                     url = vm.$restUrl.gsarDelPackageUrl + "/" + csarId;\r
-                    //commonUtil.delete(url, function(resp) {\r
-                    //    vm.gotoPackageListPage();\r
-                    //});\r
                 } else if(type == "SSAR") {\r
                     url = vm.$restUrl.ssarDelPackageUrl + "/" + csarId;\r
-                    //commonUtil.delete(url, function(resp) {\r
-                    //    vm.gotoPackageListPage();\r
-                    //});\r
                 }\r
-                commonUtil.delete(url, function(resp) {\r
-                    vm.gotoPackageListPage();\r
-                });\r
+                pmUtil.delPackage(url);\r
             }\r
         });\r
     },\r
@@ -226,26 +207,28 @@ var vm = avalon.define({
         return false;\r
     },\r
 \r
-    onBoardPackage : function(csarId,type) {\r
+    onBoardPackage : function(csarId,type,onBoardState) {\r
         var param = {\r
             csarId : csarId\r
         };\r
         if(type == "NSAR") {\r
-            //vm.csarIdSelected = csarId;\r
-            //vm.showOnboardDialog(csarId);\r
             var url = vm.$restUrl.nsarOnboardUrl;\r
             pmUtil.doOnBoard(url, param);\r
         } else if(type == "NFAR") {\r
-            //var url = vm.$restUrl.nfarOnboardUrl;\r
-            //pmUtil.doOnBoard(url, param);\r
             vm.csarIdSelected = csarId;\r
             vm.showOnboardDialog(csarId);\r
         } else if(type == "GSAR") {\r
             var url = vm.$restUrl.gsarOnboardUrl;\r
             pmUtil.doOnBoard(url, param);\r
         } else if(type == "SSAR") {\r
-            var url = vm.$restUrl.ssarOnboardUrl;\r
-            pmUtil.doOnBoard(url, param);\r
+            var ssarTarOnbardState="";            \r
+            if(onBoardState =="onBoarded") {\r
+                ssarTarOnbardState = "non-onBoarded";\r
+            } else {\r
+                ssarTarOnbardState = "onBoarded";\r
+            }\r
+            var url = vm.$restUrl.ssarOnboardUrl+"/"+csarId+"?onBoardState="+ssarTarOnbardState\r
+            pmUtil.doSSAROnboard(url);\r
         }\r
     },\r
     showOnboardDialog : function(csarId) {\r
@@ -321,6 +304,7 @@ var vm = avalon.define({
     },\r
     gotoPackageListPage:function(){\r
         window.location.href="./csarPackage.html";\r
+        refreshByCond();\r
     }\r
 });\r
 avalon.scan();\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
index 9b8d10e..b7b5bbf 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
@@ -40,54 +40,6 @@ pmUtil.changeTableStatus = function(name, status) {
     }\r
 }\r
 \r
-pmUtil.isRowDeletingStatus = function(name) {\r
-    var table = $("#" + vm.$tableId).dataTable();\r
-    var tableData = table.fnGetData();\r
-    for (var i=0; i<tableData.length; i++) {\r
-        if(tableData[i]["name"] == name && \r
-           tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-deleting")) > -1) {\r
-            return true;            \r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-pmUtil.delPackage = function(csarId) {\r
-    if(pmUtil.isRowDeletingStatus(csarId)){\r
-        return;\r
-    }\r
-       bootbox.confirm($.i18n.prop("nfv-package-iui-message-delete-confirm"), function(result){\r
-               if(result) {\r
-            pmUtil.changeTableStatus(csarId, "deleting");\r
-                       var url = vm.$restUrl.delPackageUrl + csarId;\r
-                       commonUtil.delete(url, function(resp) {\r
-                               \r
-                       });\r
-               }\r
-       });             \r
-}\r
-\r
-pmUtil.isRowOnBoardingStatus = function(name) {\r
-    var table = $("#" + vm.$tableId).dataTable();\r
-    var tableData = table.fnGetData();\r
-    for (var i=0; i<tableData.length; i++) {\r
-        if(tableData[i]["name"] == name &&\r
-            tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-onboarding")) > -1) {\r
-            return true;\r
-        }\r
-    }\r
-    return false;\r
-}\r
-\r
-pmUtil.onBoardPackage = function(name) {\r
-    if(pmUtil.isRowOnBoardingStatus(name)){\r
-        return;\r
-    }\r
-    pmUtil.changeTableStatus(name, "onboarding");\r
-    var url = vm.$restUrl.delPackageUrl + "?csarName=" + name;\r
-    commonUtil.delete(url, function(resp) {\r
-    });\r
-}\r
 //query packages exist\r
 //0: the package does not exist \r
 //1: the package does not exist, but the instance cite this package\r
@@ -177,3 +129,32 @@ pmUtil.doNFAROnboard = function(extData) {
         }\r
     });\r
 }\r
+\r
+pmUtil.doSSAROnboard = function(url) {\r
+    $.ajax({\r
+        type : "PUT",\r
+        url : url,\r
+        contentType : "application/json",\r
+        success : function(resp) {\r
+            refreshByCond();\r
+        },\r
+        error : function() {\r
+            commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+        }\r
+    });\r
+}\r
+\r
+pmUtil.delPackage = function (url) {\r
+    $.ajax({\r
+        type : "DELETE",\r
+        url : url,\r
+        contentType : "application/json",\r
+        success : function(resp) {\r
+            refreshByCond();\r
+        },\r
+        error : function() {\r
+            refreshByCond();\r
+            //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");\r
+        }\r
+    });\r
+}\r