diff options
| author |   maopengzhang <zhang.maopeng1@zte.com.cn> | 2017-09-02 16:34:27 +0800 |
|---|---|---|
| committer | maopengzhang <zhang.maopeng1@zte.com.cn> | 2017-09-02 16:34:27 +0800 |
| commit | ef3e17a67e5210b57f56b92a86bd950d0cc13be7 (patch) | |
| tree | fa9ab3ce05d69b77ff1903269cbdeced0792539e | |
| parent | 3a01f015cfcbb6161c4329444e3999c0c8144b4a (diff) | |
Add tosca parser patch1
add tosca parser API patch in catalog
Change-Id: I8fe64afe97c3e6737d1e1ec460fd98f25be32774
Issue-ID: VFC-35
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
| -rw-r--r-- | catalog/packages/tests.py | 6 | ||||
| -rw-r--r-- | catalog/packages/urls.py | 4 | ||||
| -rw-r--r-- | catalog/swagger/vfc.catalog.swagger.json | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py index d7658081..e046912d 100644 --- a/catalog/packages/tests.py +++ b/catalog/packages/tests.py @@ -452,9 +452,7 @@ class PackageTest(unittest.TestCase): @mock.patch.object(NsPackage, 'get_csars') def test_nspackages_get(self,mock_get_csars): - mock_get_csars.return_value = [0,self.csars] - response = self.client.get("/api/catalog/v1/nspackages") self.assertEqual(status.HTTP_200_OK, response.status_code, response.content) self.assertEquals(self.csars,response.data) @@ -580,10 +578,10 @@ class PackageTest(unittest.TestCase): def test_nf_package_parser(self): reqdata={"csarId":"1"} - response = self.client.post("/api/catalog/v1/vnfpackagemodel",reqdata) + response = self.client.post("/api/catalog/v1/parservnfd",reqdata) self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content) def test_ns_package_parser(self): reqdata = {"csarId": "1"} - response = self.client.post("/api/catalog/v1/nspackagemodel",reqdata) + response = self.client.post("/api/catalog/v1/parsernsd",reqdata) self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)
\ No newline at end of file diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py index f372464e..ace66491 100644 --- a/catalog/packages/urls.py +++ b/catalog/packages/urls.py @@ -20,8 +20,8 @@ urlpatterns = [ url(r'^api/catalog/v1/nspackages/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.ns_rd_csar, name='nspackage_rd'), url(r'^api/catalog/v1/vnfpackages$', views.nfpackages_rc, name='nfpackages_rc'), url(r'^api/catalog/v1/vnfpackages/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nf_rd_csar, name='nfpackage_rd'), - url(r'^api/catalog/v1/nspackagemodel$', views.ns_model_parser, name='nsmodelparser_rc'), - url(r'^api/catalog/v1/vnfpackagemodel$', views.vnf_model_parser, name='vnfmodelparser_rc'), + url(r'^api/catalog/v1/parsernsd$', views.ns_model_parser, name='nsmodelparser_rc'), + url(r'^api/catalog/v1/parservnfd$', views.vnf_model_parser, name='vnfmodelparser_rc'), ] diff --git a/catalog/swagger/vfc.catalog.swagger.json b/catalog/swagger/vfc.catalog.swagger.json index 5ff983e9..f6ae5b26 100644 --- a/catalog/swagger/vfc.catalog.swagger.json +++ b/catalog/swagger/vfc.catalog.swagger.json @@ -144,7 +144,7 @@ }
}
},
- "/nspackagemodel": {
+ "/parsernsd": {
"post": {
"tags": [
"model"
@@ -316,7 +316,7 @@ }
}
},
- "/vnfpackagemodel": {
+ "/parservnfd": {
"post": {
"tags": [
"model"
@@ -590,8 +590,8 @@ "description": "csar Package Id"
},
"inputs": {
- "type": "string",
- "description": "csar package inputs"
+ "type": "object",
+ "description": "csar package json inputs"
}
}
},
@@ -599,8 +599,8 @@ "type": "object",
"properties": {
"model": {
- "type": "string",
- "description": "model json data"
+ "type": "object",
+ "description": "csar model json data"
}
}
}
|