summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-11-02Merge "fix issue: GSO-95" into sunjin xin1-7/+84
2016-11-02Merge "Issue-Id: GSO-88 Fix js error and add i18n support" into sunjin xin1-0/+0
2016-11-02Merge "Issue-Id: GSO-88 Fix js error and add i18n support" into sunjin xin2-5/+20
2016-11-02fix issue: GSO-95c001491071-10/+87
Change-Id: I0ea52b3e8aede3741a84548767f38b71d3057f12 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2016-11-02Issue-Id: GSO-88 Fix js error and add i18n supportLuji71-0/+0
Change-Id: I886783f725b768f8da357ff9c91e44e1d932c214 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-02Issue-Id: GSO-88 Fix js error and add i18n supportLuji72-5/+20
Change-Id: I6868341308222bf56ff1f4037115725fe8f3885e Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-02Merge "SDNO-843" into sunjin xin5-76/+240
2016-11-02SDNO-843Seshu-Kumar-M5-76/+240
Change-Id: I4ecf99d8592d67b764d0c21c0950651937e2deac Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-02Merge "Issue-Id: GSO-88 add error prompt and async receive job status for ↵jin xin3-39/+176
creating and deleting non GSO service." into sun
2016-11-02Issue-Id: GSO-88 add error prompt and async receive job status for creating ↵Luji73-39/+176
and deleting non GSO service. Change-Id: I9cd41ea8eeccb9d5d0eb84568ed28a1bce19fe3b Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-02GSO-94“shentao”7-116/+46
Change-Id: I8394a483f4f214da092d3f3d294e661932afe2a7 Signed-off-by: “shentao” <shentao@chinamobile.com>
2016-11-02Merge "NFVO-57" into sunjin xin5-0/+70
2016-11-02Merge "NFVO-57" into sunjin xin7-0/+110
2016-11-02Merge "ME of the port should be a mandatory field for the create Port to ↵jin xin1-0/+1
work fine." into sun
2016-11-02NFVO-57Seshu-Kumar-M5-0/+70
Change-Id: I4c6d2c48850d16409716cf5c56edaad6e7e9db4a Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-02NFVO-57Seshu-Kumar-M7-0/+110
Change-Id: Iaeb002fa5ee7f54916a527027944a19acd954d33 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-02ME of the port should be a mandatory field for the create Port to work fine.Seshu-Kumar-M1-0/+1
SDNO-832 Change-Id: Ia841f552aa0af1f570fbd8ab541aaea2ff5a2b3f Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-02change the default page as no cache.zhouruiyu2-0/+2
https://jira.open-o.org/browse/OCS-145 Change-Id: Ife4ffa9b048fbc51492b50a96192d45567e274dc Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01Merge "Issue-Id: GSO-80 display name instead of description" into sunjin xin1-3/+16
2016-11-01Merge "change the default page as no cache. ↵jin xin1-0/+1
https://jira.open-o.org/browse/OCS-145" into sun
2016-11-01Merge "Issue ID: GSO-91" into sunjin xin1-8/+8
2016-11-01Issue ID: GSO-91j003022801-8/+8
Change-Id: I3d3020a7d5340bb1e839c3b2bc1bec1b764d6b6d Signed-off-by: j00302280 <j00101220@huawei.com>
2016-11-01change the default page as no cache.zhouruiyu1-0/+1
https://jira.open-o.org/browse/OCS-145 Change-Id: I1ff955cb1bd43f51a4879d511e8ec74da3c6b9d7 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01Issue-Id: GSO-80 display name instead of descriptionLuji71-3/+16
Change-Id: I63d2e32e9a6e7e5bd8293c272d0f55742b5ba679 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-01Merge "Issue-Id: GSO-80 display name instead of description" into sunjin xin1-7/+12
2016-11-01change the default page as no cache.zhouruiyu1-0/+1
https://jira.open-o.org/browse/OCS-145 Change-Id: Ie300f51213e5818eab160fb31f69d8cfad97dfea Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01Merge "Issue ID: GSO-91" into sunjin xin1-2/+2
2016-11-01Issue-Id: GSO-80 display name instead of descriptionLuji71-7/+12
Change-Id: Id02a0486a8a69f88926aecf93951c0cdf9263123 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-01Issue ID: GSO-91j003022801-2/+2
Change-Id: I17afae6c787d76376d87e7c8df97cefe62b127dd Signed-off-by: j00302280 <j00101220@huawei.com>
2016-11-01change the import js file sequence . make the logout function ok .zhouruiyu1-98/+26
https://jira.open-o.org/browse/OCS-145 Change-Id: I7c3775781345ddac677dbe4e92fd2fac2b4f8704 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01change the logout function , make it ok.zhouruiyu3-3/+9
https://jira.open-o.org/browse/OCS-145 Change-Id: I064bc94b435e0254578b69a56aff14cf4001d92a Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01add the logout page in the portal, but need to framework logout icon add the ↵zhouruiyu1-0/+39
event listener to call this page. https://jira.open-o.org/browse/OCS-145 Change-Id: I99f87da7697edec44b3382319b6f4a1be546e7d0 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01Change the login js logic in the login.js. make it can work nowzhouruiyu1-6/+15
https://jira.open-o.org/browse/OCS-130 Change-Id: I0ae3fad366afeb67d1bed71a63f48f19eab8b13b Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
2016-11-01Merge "Port of the Resource Manager SDNO does not include the Native ID and ↵jin xin2-4/+22
hence query of the Port is not related. Also remove the fields of the NE that are not returned by query all." into sun
2016-11-01Port of the Resource Manager SDNO does not include the Native ID and hence ↵Seshu-Kumar-M2-4/+22
query of the Port is not related. Also remove the fields of the NE that are not returned by query all. SDNO-832 Change-Id: I1895f7ab32d3df74f37b970b5372fe2a801deb68 Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-01Modify the alert message while delete package.nancylizi3-7/+31
Change-Id: I4bc61b17e3574526387ef04ccf1e0129b16a2636 Issue-id:GSO-90 Signed-off-by: nancylizi <li.zi30@zte.com.cn>
2016-11-01Merge "create NE is not updating the controller info in the DB and is so ↵jin xin1-8/+22
blocking the further requests of the ESR." into sun
2016-11-01Merge "Issue-Id: GSO-80 display name instead of description" into sunjin xin1-3/+3
2016-11-01Merge "Fix Issue-Id: GSO-80" into sunjin xin4-1/+70
2016-11-01create NE is not updating the controller info in the DB and is so blocking ↵Seshu-Kumar-M1-8/+22
the further requests of the ESR. SDNO-828 Change-Id: I18f37973df493df3c05ea7894ad1976fbe5c218d Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-11-01Issue-Id: GSO-80 display name instead of descriptionLuji71-3/+3
Change-Id: I73f84201c351006cf36335f40a3e538e43d48c17 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-11-01OCS-130“shentao”12-121/+117
Change-Id: Ib86f91df5fcac529a6100f44c13092e6af03ca56 Signed-off-by: “shentao” <shentao@chinamobile.com>
2016-11-01Fix Issue-Id: GSO-80Luji74-1/+70
Change-Id: Ib1dd9256874d60db96c1b232adb09ed2a6b827f0 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
2016-10-31fix controller can not delete bugyuhao102-5/+3
controller can not delete cause we use sdncontrollerid as uuid in brs model but we use id as index to delete controller in html SDNO-805 Change-Id: Ibdb69b1d10b24725a9847953ce3a2b838362c518 Signed-off-by: yuhao10 <yuhao10@huawei.com>
2016-10-31Merge "fix issue:GSO-89" into sunjin xin2-2/+63
2016-10-31fix issue:GSO-89c001491072-2/+63
Change-Id: I67c5e24d6bbd82f7e1340c9e93d19b9cc1e929b9 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2016-10-31Merge "fix bug in controller.html remove useless function which is already ↵jin xin1-1/+0
removed in controller.js. SDNO-805" into sun
2016-10-31Merge "Fix for the issue of input param showing the complete key path to the ↵jin xin1-1/+6
user" into sun
2016-10-31Fix for the issue of input param showing the complete key path to the userSeshu-Kumar-M1-1/+6
GSO-77 Change-Id: I704a47f8f0d7e20d672cf469a4dd939b310e06bf Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>
2016-10-31fix bug in controller.htmlyuhao101-1/+0
remove useless function which is already removed in controller.js. SDNO-805 Change-Id: I3de4609c4bf8d7c7679f07e228f6b975b33e1ef9 Signed-off-by: yuhao10 <yuhao10@huawei.com> (cherry picked from commit 81c3fd964071c0d1d4804ca07dbc2cc09c5b6b16)